diff --git a/ct/calibre-web.sh b/ct/calibre-web.sh
new file mode 100644
index 000000000..278dd9ff8
--- /dev/null
+++ b/ct/calibre-web.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: mikolaj92
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://github.com/janeczku/calibre-web
+
+APP="calibre-web"
+var_tags="${var_tags:-media;books}"
+var_cpu="${var_cpu:-2}"
+var_ram="${var_ram:-2048}"
+var_disk="${var_disk:-8}"
+var_os="${var_os:-debian}"
+var_version="${var_version:-13}"
+var_unprivileged="${var_unprivileged:-1}"
+
+header_info "$APP"
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -d /opt/calibre-web ]]; then
+    msg_error "No Calibre-Web Installation Found!"
+    exit
+  fi
+
+  if check_for_gh_release "calibre-web" "janeczku/calibre-web"; then
+    msg_info "Stopping Service"
+    systemctl stop calibre-web
+    msg_ok "Stopped Service"
+
+    msg_info "Backing up Data"
+    cp -r /opt/calibre-web/app.db /opt/calibre-web/app.db_backup 2>/dev/null
+    msg_ok "Backed up Data"
+
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "tarball" "latest" "/opt/calibre-web"
+    setup_uv
+
+    msg_info "Installing Dependencies"
+    cd /opt/calibre-web
+    $STD uv sync --no-dev
+    msg_ok "Installed Dependencies"
+
+    msg_info "Restoring Data"
+    cp /opt/calibre-web/app.db_backup /opt/calibre-web/app.db 2>/dev/null
+    rm -f /opt/calibre-web/app.db_backup
+    msg_ok "Restored Data"
+
+    msg_info "Starting Service"
+    systemctl start calibre-web
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  fi
+  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 "${TAB}${GATEWAY}${BGN}http://${IP}:8083${CL}"
diff --git a/ct/drawio.sh b/ct/drawio.sh
deleted file mode 100644
index f59030345..000000000
--- a/ct/drawio.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Slaviša Arežina (tremor021)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://www.drawio.com/
-
-APP="DrawIO"
-var_tags="${var_tags:-diagrams}"
-var_cpu="${var_cpu:-1}"
-var_ram="${var_ram:-2048}"
-var_disk="${var_disk:-4}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-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 /var/lib/tomcat11/webapps/draw.war ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "drawio" "jgraph/drawio"; then
-    msg_info "Stopping service"
-    systemctl stop tomcat11
-    msg_ok "Service stopped"
-
-    msg_info "Updating Debian LXC"
-    $STD apt update
-    $STD apt upgrade -y
-    msg_ok "Updated Debian LXC"
-
-    USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "drawio" "jgraph/drawio" "singlefile" "latest" "/var/lib/tomcat11/webapps" "draw.war"
-
-    msg_info "Starting service"
-    systemctl start tomcat11
-    msg_ok "Service started"
-    msg_ok "Updated successfully!"
-  fi
-  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 "${TAB}${GATEWAY}${BGN}http://${IP}:8080/draw${CL}"
diff --git a/ct/ebusd.sh b/ct/ebusd.sh
deleted file mode 100644
index 099f4d2d9..000000000
--- a/ct/ebusd.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Joerg Heinemann (heinemannj)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://github.com/john30/ebusd
-
-APP="ebusd"
-var_tags="${var_tags:-automation}"
-var_cpu="${var_cpu:-1}"
-var_ram="${var_ram:-512}"
-var_disk="${var_disk:-2}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-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/default/ebusd ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-  if check_for_gh_release "ebusd" "john30/ebusd"; then
-    msg_info "Stopping Services"
-    systemctl stop ebusd.service
-    msg_ok "Stopped Services"
-
-    fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "/opt/ebusd" "ebusd-*_amd64-trixie_mqtt1.deb"
-
-    msg_info "Starting Services"
-    systemctl start ebusd.service
-    msg_ok "Started Services"
-    msg_ok "Updated successfully!"
-  fi
-  exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed successfully!\n"
-echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
diff --git a/ct/gramps-web.sh b/ct/gramps-web.sh
new file mode 100644
index 000000000..fe3d29ece
--- /dev/null
+++ b/ct/gramps-web.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: GitHub Copilot
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://www.grampsweb.org/
+
+APP="gramps-web"
+var_tags="${var_tags:-genealogy;family;collaboration}"
+var_cpu="${var_cpu:-2}"
+var_ram="${var_ram:-4096}"
+var_disk="${var_disk:-20}"
+var_os="${var_os:-debian}"
+var_version="${var_version:-13}"
+var_unprivileged="${var_unprivileged:-1}"
+
+header_info "$APP"
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -d /opt/gramps-web-api ]]; then
+    msg_error "No Gramps Web API Installation Found!"
+    exit
+  fi
+
+  if [[ ! -d /opt/gramps-web/frontend ]]; then
+    msg_error "No Gramps Web Frontend Installation Found!"
+    exit
+  fi
+
+  if [[ ! -f /opt/gramps-web/config/config.cfg ]]; then
+    msg_error "No Gramps Web Configuration Found!"
+    exit
+  fi
+
+  PYTHON_VERSION="3.12" setup_uv
+  NODE_VERSION="22" setup_nodejs
+
+  UPDATE_AVAILABLE=0
+  if check_for_gh_release "gramps-web-api" "gramps-project/gramps-web-api"; then
+    UPDATE_AVAILABLE=1
+  fi
+  if check_for_gh_release "gramps-web" "gramps-project/gramps-web"; then
+    UPDATE_AVAILABLE=1
+  fi
+
+  if [[ "$UPDATE_AVAILABLE" == "1" ]]; then
+    msg_info "Stopping Service"
+    systemctl stop gramps-web
+    msg_ok "Stopped Service"
+
+    if apt-cache show libgirepository1.0-dev >/dev/null 2>&1; then
+      GI_DEV_PACKAGE="libgirepository1.0-dev"
+    elif apt-cache show libgirepository-2.0-dev >/dev/null 2>&1; then
+      GI_DEV_PACKAGE="libgirepository-2.0-dev"
+    else
+      msg_error "No supported girepository development package found!"
+      exit
+    fi
+
+    msg_info "Ensuring Build Dependencies"
+    $STD apt install -y \
+      gobject-introspection \
+      libcairo2-dev \
+      libglib2.0-dev \
+      pkg-config \
+      "$GI_DEV_PACKAGE"
+    msg_ok "Ensured Build Dependencies"
+
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "gramps-web-api" "gramps-project/gramps-web-api" "tarball" "latest" "/opt/gramps-web-api"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "gramps-web" "gramps-project/gramps-web" "tarball" "latest" "/opt/gramps-web/frontend"
+
+    msg_info "Updating Gramps Web API"
+    $STD uv venv -c -p python3.12 /opt/gramps-web/venv
+    source /opt/gramps-web/venv/bin/activate
+    $STD uv pip install --no-cache-dir --upgrade pip setuptools wheel
+    $STD uv pip install --no-cache-dir gunicorn
+    $STD uv pip install --no-cache-dir /opt/gramps-web-api
+    msg_ok "Updated Gramps Web API"
+
+    msg_info "Updating Gramps Web Frontend"
+    cd /opt/gramps-web/frontend
+    export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+    corepack enable
+    $STD npm install
+    $STD npm run build
+    msg_ok "Updated Gramps Web Frontend"
+
+    msg_info "Applying Database Migration"
+    GRAMPS_API_CONFIG=/opt/gramps-web/config/config.cfg \
+      GRAMPSHOME=/opt/gramps-web/data/gramps \
+      GRAMPS_DATABASE_PATH=/opt/gramps-web/data/gramps/grampsdb \
+      $STD /opt/gramps-web/venv/bin/python3 -m gramps_webapi user migrate
+    msg_ok "Applied Database Migration"
+
+    msg_info "Starting Service"
+    systemctl start gramps-web
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  fi
+
+  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 "${TAB}${GATEWAY}${BGN}http://${IP}:5000${CL}"
diff --git a/ct/headers/ebusd b/ct/headers/ebusd
deleted file mode 100644
index fec79a3e3..000000000
--- a/ct/headers/ebusd
+++ /dev/null
@@ -1,6 +0,0 @@
-        __                   __
-  ___  / /_   _  ___________/ /
- / _ \/ __ \/ / / / ___/ __  /
-/  __/ /_/ / /_/ (__  ) /_/ /
-\___/_.___/\__,_/____/\__,_/
-
diff --git a/ct/headers/romm b/ct/headers/romm
deleted file mode 100644
index 3e942aefb..000000000
--- a/ct/headers/romm
+++ /dev/null
@@ -1,6 +0,0 @@
-    ____                  __  ___
-   / __ \____  ____ ___  /  |/  /
-  / /_/ / __ \/ __ `__ \/ /|_/ / 
- / _, _/ /_/ / / / / / / /  / /  
-/_/ |_|\____/_/ /_/ /_/_/  /_/   
-                                 
diff --git a/ct/linkding.sh b/ct/linkding.sh
deleted file mode 100644
index d3f78ce8f..000000000
--- a/ct/linkding.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (MickLesk)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://linkding.link/
-
-APP="linkding"
-var_tags="${var_tags:-bookmarks;management}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-1024}"
-var_disk="${var_disk:-4}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -d /opt/linkding ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "linkding" "sissbruecker/linkding"; then
-    msg_info "Stopping Services"
-    systemctl stop nginx linkding linkding-tasks
-    msg_ok "Stopped Services"
-
-    msg_info "Backing up Data"
-    cp -r /opt/linkding/data /opt/linkding_data_backup
-    cp /opt/linkding/.env /opt/linkding_env_backup
-    msg_ok "Backed up Data"
-
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "linkding" "sissbruecker/linkding"
-
-    msg_info "Restoring Data"
-    cp -r /opt/linkding_data_backup/. /opt/linkding/data
-    cp /opt/linkding_env_backup /opt/linkding/.env
-    rm -rf /opt/linkding_data_backup /opt/linkding_env_backup
-    ln -sf /usr/lib/x86_64-linux-gnu/mod_icu.so /opt/linkding/libicu.so
-    msg_ok "Restored Data"
-
-    msg_info "Updating ${APP}"
-    cd /opt/linkding
-    rm -f bookmarks/settings/dev.py
-    touch bookmarks/settings/custom.py
-    $STD npm ci
-    $STD npm run build
-    $STD uv sync --no-dev --frozen
-    $STD uv pip install gunicorn
-    set -a && source /opt/linkding/.env && set +a
-    $STD /opt/linkding/.venv/bin/python manage.py migrate
-    $STD /opt/linkding/.venv/bin/python manage.py collectstatic --no-input
-    msg_ok "Updated ${APP}"
-
-    msg_info "Starting Services"
-    systemctl start nginx linkding linkding-tasks
-    msg_ok "Started Services"
-    msg_ok "Updated Successfully"
-  fi
-  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 "${TAB}${GATEWAY}${BGN}http://${IP}:9090${CL}"
diff --git a/ct/papra.sh b/ct/papra.sh
index 29c11adc1..5aad8db72 100644
--- a/ct/papra.sh
+++ b/ct/papra.sh
@@ -27,7 +27,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  RELEASE=$(curl -fsSL https://api.github.com/repos/papra-hq/papra/releases | grep -oP '"tag_name":\s*"\K@papra/docker@[^"]+' | head -n1)
+  RELEASE=$(curl -fsSL https://api.github.com/repos/papra-hq/papra/releases | grep -oP '"tag_name":\s*"\K@papra/app@[^"]+' | head -n1)
   if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt 2>/dev/null)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
     msg_info "Stopping Service"
     systemctl stop papra
diff --git a/ct/romm.sh b/ct/romm.sh
deleted file mode 100644
index 3d9c37a1b..000000000
--- a/ct/romm.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (CanbiZ)
-# Co-author: AlphaLawless
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://romm.app
-
-APP="RomM"
-var_tags="${var_tags:-emulation}"
-var_cpu="${var_cpu:-2}"
-var_ram="${var_ram:-4096}"
-var_disk="${var_disk:-20}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-    header_info
-    check_container_storage
-    check_container_resources
-
-    if [[ ! -d /opt/romm ]]; then
-        msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-
-    if check_for_gh_release "romm" "rommapp/romm"; then
-        msg_info "Stopping Services"
-        systemctl stop romm-backend romm-worker romm-scheduler romm-watcher
-        msg_ok "Stopped Services"
-
-        msg_info "Backing up configuration"
-        cp /opt/romm/.env /opt/romm/.env.backup
-        msg_ok "Backed up configuration"
-
-        msg_info "Updating ROMM"
-        fetch_and_deploy_gh_release "romm" "rommapp/romm" "tarball" "latest" "/opt/romm"
-
-        cp /opt/romm/.env.backup /opt/romm/.env
-
-        cd /opt/romm
-        $STD uv sync --all-extras
-
-        cd /opt/romm/backend
-        $STD uv run alembic upgrade head
-
-        cd /opt/romm/frontend
-        $STD npm install
-        $STD npm run build
-
-        # Merge static assets into dist folder
-        cp -rf /opt/romm/frontend/assets/* /opt/romm/frontend/dist/assets/
-
-        mkdir -p /opt/romm/frontend/dist/assets/romm
-        ln -sfn /var/lib/romm/resources /opt/romm/frontend/dist/assets/romm/resources
-        ln -sfn /var/lib/romm/assets /opt/romm/frontend/dist/assets/romm/assets
-        msg_ok "Updated ROMM"
-
-        msg_info "Starting Services"
-        systemctl start romm-backend romm-worker romm-scheduler romm-watcher
-        msg_ok "Started Services"
-        msg_ok "Updated successfully"
-    fi
-    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 "${TAB}${GATEWAY}${BGN}http://${IP}${CL}"
diff --git a/ct/seer.sh b/ct/seer.sh
deleted file mode 100644
index 7aba57e52..000000000
--- a/ct/seer.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://docs.seerr.dev/
-
-APP="Seer"
-var_tags="${var_tags:-media}"
-var_cpu="${var_cpu:-4}"
-var_ram="${var_ram:-4096}"
-var_disk="${var_disk:-8}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-13}"
-var_unprivileged="${var_unprivileged:-1}"
-
-header_info "$APP"
-variables
-color
-catch_errors
-
-function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  if [[ ! -d /opt/seer ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-
-  if check_for_gh_release "seer" "seerr-team/seerr"; then
-    msg_info "Stopping Service"
-    systemctl stop seer
-    msg_ok "Stopped Service"
-
-    pnpm_desired=$(grep -Po '"pnpm":\s*"\K[^"]+' /opt/seer/package.json)
-    NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
-
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "seer" "seerr-team/seerr" "tarball" "latest"
-
-    cd /opt/seer
-    export CYPRESS_INSTALL_BINARY=0
-    $STD pnpm install --frozen-lockfile
-    export NODE_OPTIONS="--max-old-space-size=3072"
-    $STD pnpm build
-
-    cat <<EOF >/etc/systemd/system/seer.service
-[Unit]
-Description=Seer Service
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/seer/seer.conf
-Environment=NODE_ENV=production
-Type=exec
-WorkingDirectory=/opt/seer
-ExecStart=/usr/bin/node dist/index.js
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-    systemctl daemon-reload
-    systemctl start seer
-    msg_ok "Started Service"
-    msg_ok "Updated successfully!"
-  fi
-  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 "${TAB}${GATEWAY}${BGN}http://${IP}:5055${CL}"
diff --git a/ct/split-pro.sh b/ct/split-pro.sh
new file mode 100644
index 000000000..8adca7a66
--- /dev/null
+++ b/ct/split-pro.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: johanngrobe
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/oss-apps/split-pro
+
+APP="Split-Pro"
+var_tags="${var_tags:-finance;expense-sharing}"
+var_cpu="${var_cpu:-2}"
+var_ram="${var_ram:-4096}"
+var_disk="${var_disk:-6}"
+var_os="${var_os:-debian}"
+var_version="${var_version:-13}"
+var_unprivileged="${var_unprivileged:-1}"
+
+variables
+color 
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -d /opt/split-pro ]]; then
+    msg_error "No Split Pro Installation Found!"
+    exit
+  fi
+
+  if check_for_gh_release "split-pro" "oss-apps/split-pro"; then
+    msg_info "Stopping Service"
+    systemctl stop split-pro
+    msg_ok "Stopped Service"
+
+    msg_info "Backing up Data"
+    cp /opt/split-pro/.env /opt/split-pro.env
+    msg_ok "Backed up Data"
+
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "split-pro" "oss-apps/split-pro" "tarball" "latest" "/opt/split-pro"
+
+    msg_info "Building Application"
+    cd /opt/split-pro
+    $STD pnpm install --frozen-lockfile
+    $STD pnpm build
+    cp /opt/split-pro.env /opt/split-pro/.env
+    rm -f /opt/split-pro.env
+    ln -sf /opt/split-pro_data/uploads /opt/split-pro/uploads
+    $STD pnpm exec prisma migrate deploy
+    msg_ok "Built Application"
+
+    msg_info "Starting Service"
+    systemctl start split-pro
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  fi
+  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 "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
diff --git a/ct/sure.sh b/ct/sure.sh
new file mode 100644
index 000000000..29f228872
--- /dev/null
+++ b/ct/sure.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: vhsdream
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://sure.am
+
+APP="Sure"
+var_tags="${var_tags:-finance}"
+var_cpu="${var_cpu:-2}"
+var_ram="${var_ram:-2048}"
+var_disk="${var_disk:-6}"
+var_os="${var_os:-debian}"
+var_version="${var_version:-13}"
+var_unprivileged="${var_unprivileged:-1}"
+
+header_info "$APP"
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -d /opt/sure ]]; then
+    msg_error "No ${APP} Installation Found!"
+    exit
+  fi
+
+  if check_for_gh_release "Sure" "we-promise/sure"; then
+    msg_info "Stopping Sure"
+    $STD systemctl stop sure
+    msg_ok "Stopped Sure"
+
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Sure" "we-promise/sure" "tarball" "latest" "/opt/sure"
+    RUBY_VERSION="$(cat /opt/sure/.ruby-version)" RUBY_INSTALL_RAILS=false setup_ruby
+
+    msg_info "Updating Sure"
+    source ~/.profile
+    cd /opt/sure
+    export RAILS_ENV=production
+    export BUNDLE_DEPLOYMENT=1
+    export BUNDLE_WITHOUT=development
+    $STD ./bin/bundle install
+    $STD ./bin/bundle exec bootsnap precompile --gemfile -j 0
+    $STD ./bin/bundle exec bootsnap precompile -j 0 app/ lib/
+    export SECRET_KEY_BASE_DUMMY=1 && $STD ./bin/rails assets:precompile
+    unset SECRET_KEY_BASE_DUMMY
+    msg_ok "Updated Sure"
+
+    msg_info "Starting Sure"
+    $STD systemctl start sure
+    msg_ok "Started Sure"
+    msg_ok "Updated successfully!"
+  fi
+  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 "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"
diff --git a/frontend/public/json/calibre-web.json b/frontend/public/json/calibre-web.json
new file mode 100644
index 000000000..7e509b0c2
--- /dev/null
+++ b/frontend/public/json/calibre-web.json
@@ -0,0 +1,44 @@
+{
+  "name": "Calibre-Web",
+  "slug": "calibre-web",
+  "categories": [
+    4
+  ],
+  "date_created": "2026-02-09",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 8083,
+  "documentation": "https://github.com/janeczku/calibre-web/wiki",
+  "website": "https://github.com/janeczku/calibre-web",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/flat/calibre-web.webp",
+  "config_path": "/opt/calibre-web/app.db",
+  "description": "Web app for browsing, reading and downloading eBooks from a Calibre database. Provides an attractive interface with mobile support, user management, and eBook conversion capabilities.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/calibre-web.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 2048,
+        "hdd": 8,
+        "os": "Debian",
+        "version": "13"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": [
+    {
+      "text": "No credentials are set by this script. Complete setup and create credentials in the first-run wizard.",
+      "type": "info"
+    },
+    {
+      "text": "Upload your Calibre library metadata.db during first setup wizard.",
+      "type": "info"
+    }
+  ]
+}
diff --git a/frontend/public/json/drawio.json b/frontend/public/json/drawio.json
deleted file mode 100644
index b3ffeb4e7..000000000
--- a/frontend/public/json/drawio.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "Draw.IO",
-  "slug": "drawio",
-  "categories": [
-    12
-  ],
-  "date_created": "2026-01-29",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 8080,
-  "documentation": "https://www.drawio.com/doc/",
-  "website": "https://www.drawio.com/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/draw-io.webp",
-  "config_path": "",
-  "description": "draw.io is a configurable diagramming and whiteboarding application, jointly owned and developed by draw.io Ltd (previously named JGraph) and draw.io AG.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/drawio.sh",
-      "resources": {
-        "cpu": 1,
-        "ram": 2048,
-        "hdd": 4,
-        "os": "Debian",
-        "version": "13"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": null,
-    "password": null
-  },
-  "notes": []
-}
\ No newline at end of file
diff --git a/frontend/public/json/ebusd.json b/frontend/public/json/ebusd.json
deleted file mode 100644
index 30743fd04..000000000
--- a/frontend/public/json/ebusd.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "ebusd",
-  "slug": "ebusd",
-  "categories": [
-    16
-  ],
-  "date_created": "2026-01-26",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": null,
-  "documentation": "https://github.com/john30/ebusd/wiki",
-  "website": "https://github.com/john30/ebusd",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/ebusd.webp",
-  "config_path": "/etc/default/ebusd",
-  "description": "ebusd is a daemon for handling communication with eBUS devices connected to a 2-wire `energy bus` used by numerous heating systems.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/ebusd.sh",
-      "resources": {
-        "cpu": 1,
-        "ram": 512,
-        "hdd": 2,
-        "os": "debian",
-        "version": "13"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": "root",
-    "password": null
-  },
-  "notes": [
-    {
-      "text": "For required post installation actions, checkout: `https://github.com/community-scripts/ProxmoxVE/discussions/11352`", 
-      "type": "info"
-    }
-  ]
-}
diff --git a/frontend/public/json/gramps-web.json b/frontend/public/json/gramps-web.json
new file mode 100644
index 000000000..a62d420f5
--- /dev/null
+++ b/frontend/public/json/gramps-web.json
@@ -0,0 +1,44 @@
+{
+    "name": "Gramps Web",
+    "slug": "gramps-web",
+    "categories": [
+        12
+    ],
+    "date_created": "2026-02-16",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 5000,
+    "documentation": "https://www.grampsweb.org/install_setup/setup/",
+    "website": "https://www.grampsweb.org/",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/gramps.webp",
+    "config_path": "/opt/gramps-web/config/config.cfg",
+    "description": "Gramps Web is a collaborative genealogy platform for browsing, editing and sharing family trees through a modern web interface.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/gramps-web.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 4096,
+                "hdd": 20,
+                "os": "Debian",
+                "version": "13"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": [
+        {
+            "text": "On first access, create the owner account via the built-in onboarding wizard.",
+            "type": "info"
+        },
+        {
+            "text": "The initial deployment compiles the frontend and can take several minutes.",
+            "type": "warning"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/frontend/public/json/linkding.json b/frontend/public/json/linkding.json
deleted file mode 100644
index 6ba919d81..000000000
--- a/frontend/public/json/linkding.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "linkding",
-    "slug": "linkding",
-    "categories": [
-        12
-    ],
-    "date_created": "2026-02-09",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 9090,
-    "documentation": "https://linkding.link/",
-    "website": "https://linkding.link/",
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/linkding.webp",
-    "config_path": "/opt/linkding/.env",
-    "description": "linkding is a self-hosted bookmark manager that is designed to be minimal, fast, and easy to set up. It features a clean UI, tag-based organization, bulk editing, Markdown notes, read it later functionality, sharing, REST API, and browser extensions for Firefox and Chrome.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/linkding.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 1024,
-                "hdd": 4,
-                "os": "Debian",
-                "version": "13"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": "admin",
-        "password": null
-    },
-    "notes": [
-        {
-            "text": "Admin credentials are stored in /opt/linkding/.env",
-            "type": "info"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/frontend/public/json/romm.json b/frontend/public/json/romm.json
deleted file mode 100644
index 02a5b199a..000000000
--- a/frontend/public/json/romm.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "RomM",
-    "slug": "romm",
-    "categories": [
-        24
-    ],
-    "date_created": "2025-03-10",
-    "type": "ct",
-    "updateable": true,
-    "privileged": false,
-    "interface_port": 80,
-    "documentation": "https://docs.romm.app/latest/",
-    "website": "https://romm.app/",
-    "config_path": "/opt/romm/.env",
-    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/romm.webp",
-    "description": "RomM (ROM Manager) allows you to scan, enrich, browse and play your game collection with a clean and responsive interface. Support for multiple platforms, various naming schemes, and custom tags.",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/romm.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 4096,
-                "hdd": 20,
-                "os": "debian",
-                "version": "13"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": null,
-        "password": null
-    },
-    "notes": []
-}
diff --git a/frontend/public/json/seer.json b/frontend/public/json/seer.json
deleted file mode 100644
index 21966d0ba..000000000
--- a/frontend/public/json/seer.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "name": "Seer",
-  "slug": "seer",
-  "categories": [
-    13
-  ],
-  "date_created": "2026-01-19",
-  "type": "ct",
-  "updateable": true,
-  "privileged": false,
-  "interface_port": 5055,
-  "documentation": "https://docs.seerr.dev/",
-  "website": "https://seerr.dev/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/seerr.webp",
-  "config_path": "/etc/seer/seer.conf",
-  "description": "Open-source media request and discovery manager for Jellyfin, Plex, and Emby. Unified version of Overseerr and Jellyseerr.",
-  "install_methods": [
-    {
-      "type": "default",
-      "script": "ct/seer.sh",
-      "resources": {
-        "cpu": 4,
-        "ram": 4096,
-        "hdd": 8,
-        "os": "Debian",
-        "version": "13"
-      }
-    }
-  ],
-  "default_credentials": {
-    "username": null,
-    "password": null
-  },
-  "notes": [
-    {
-      "text": "Seer migration is currently in beta.",
-      "type": "warning"
-    },
-    {
-      "text": "First release is essentially Jellyseerr rebranded with Overseerr migration support.",
-      "type": "info"
-    }
-  ]
-}
diff --git a/frontend/public/json/split-pro.json b/frontend/public/json/split-pro.json
new file mode 100644
index 000000000..34b85b49c
--- /dev/null
+++ b/frontend/public/json/split-pro.json
@@ -0,0 +1,44 @@
+{
+    "name": "Split Pro",
+    "slug": "split-pro",
+    "categories": [
+        12
+    ],
+    "date_created": "2026-02-12",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 3000,
+    "documentation": "https://github.com/oss-apps/split-pro/blob/main/docker/README.md",
+    "website": "https://github.com/oss-apps/split-pro",
+    "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/splitpro.webp",
+    "config_path": "/opt/split-pro/.env",
+    "description": "SplitPro is a self-hosted, open source way to share expenses with friends. It is designed as a replacement for Splitwise.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/split-pro.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 4096,
+                "hdd": 6,
+                "os": "debian",
+                "version": "13"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": [
+        {
+            "text": "Before first use you must configure email credentials or authentication (OAuth/OIDC) provider in `/opt/split-pro/.env` and restart the service `systemctl restart split-pro`.",
+            "type": "warning"
+        },
+        {
+            "text": "Receipt uploads are stored in `/opt/split-pro_data/uploads`",
+            "type": "info"
+        }
+    ]
+}
diff --git a/frontend/public/json/sure.json b/frontend/public/json/sure.json
new file mode 100644
index 000000000..e2f1eec1e
--- /dev/null
+++ b/frontend/public/json/sure.json
@@ -0,0 +1,35 @@
+{
+  "name": "Sure",
+  "slug": "sure",
+  "categories": [
+    23
+  ],
+  "date_created": "2026-02-18",
+  "type": "ct",
+  "updateable": true,
+  "privileged": false,
+  "interface_port": 3000,
+  "documentation": "https://github.com/we-promise/sure",
+  "website": "https://sure.am",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/sure-finance.webp",
+  "config_path": "/etc/sure/.env",
+  "description": "The personal finance app for everyone. NOT affiliated with or endorsed by Maybe Finance Inc..",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/sure.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 2048,
+        "hdd": 6,
+        "os": "Debian",
+        "version": "13"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": null,
+    "password": null
+  },
+  "notes": []
+}
diff --git a/frontend/public/json/truenas-vm.json b/frontend/public/json/truenas-vm.json
index 7f11e7564..f35151a32 100644
--- a/frontend/public/json/truenas-vm.json
+++ b/frontend/public/json/truenas-vm.json
@@ -6,7 +6,7 @@
   ],
   "date_created": "2026-01-16",
   "type": "vm",
-  "updateable": true,
+  "updateable": false,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://www.truenas.com/docs/",
@@ -22,7 +22,7 @@
         "cpu": 2,
         "ram": 8192,
         "hdd": 16,
-        "os": null,
+        "os": "Debian",
         "version": null
       }
     }
diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh
new file mode 100644
index 000000000..dc201423c
--- /dev/null
+++ b/install/calibre-web-install.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: mikolaj92
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://github.com/janeczku/calibre-web
+
+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 \
+  python3 \
+  imagemagick \
+  libpango-1.0-0 \
+  libharfbuzz0b \
+  libpangoft2-1.0-0 \
+  fonts-liberation
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Calibre (for eBook conversion)"
+$STD apt install -y calibre
+msg_ok "Installed Calibre"
+
+fetch_and_deploy_gh_release "calibre-web" "janeczku/calibre-web" "tarball" "latest" "/opt/calibre-web"
+setup_uv
+
+msg_info "Installing Python Dependencies"
+cd /opt/calibre-web
+$STD uv sync --no-dev
+msg_ok "Installed Python Dependencies"
+
+msg_info "Creating Service"
+mkdir -p /opt/calibre-web/data
+cat <<EOF >/etc/systemd/system/calibre-web.service
+[Unit]
+Description=Calibre-Web Service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/calibre-web
+ExecStart=/opt/calibre-web/.venv/bin/python /opt/calibre-web/cps.py
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now calibre-web
+msg_ok "Created Service"
+
+motd_ssh
+customize
+cleanup_lxc
diff --git a/install/databasus-install.sh b/install/databasus-install.sh
index 0b068d865..b6001ab2a 100644
--- a/install/databasus-install.sh
+++ b/install/databasus-install.sh
@@ -47,16 +47,13 @@ msg_ok "Built Databasus"
 msg_info "Configuring Databasus"
 JWT_SECRET=$(openssl rand -hex 32)
 ENCRYPTION_KEY=$(openssl rand -hex 32)
-
 # Create PostgreSQL version symlinks for compatibility
 for v in 12 13 14 15 16 18; do
   ln -sf /usr/lib/postgresql/17 /usr/lib/postgresql/$v
 done
-
 # Install goose for migrations
 $STD go install github.com/pressly/goose/v3/cmd/goose@latest
 ln -sf /root/go/bin/goose /usr/local/bin/goose
-
 cat <<EOF >/opt/databasus/.env
 # Environment
 ENV_MODE=production
@@ -166,6 +163,7 @@ ln -sf /etc/nginx/sites-available/databasus /etc/nginx/sites-enabled/databasus
 rm -f /etc/nginx/sites-enabled/default
 $STD nginx -t
 $STD systemctl enable -q --now nginx
+$STD systemctl reload nginx
 msg_ok "Configured Nginx"
 
 motd_ssh
diff --git a/install/discourse-install.sh b/install/discourse-install.sh
index 253200580..aa3e575d6 100644
--- a/install/discourse-install.sh
+++ b/install/discourse-install.sh
@@ -30,7 +30,7 @@ msg_ok "Installed Dependencies"
 
 PG_VERSION="16" setup_postgresql
 NODE_VERSION="22" setup_nodejs
-RUBY_VERSION="3.3.6" setup_ruby
+RUBY_VERSION="3.4.4" setup_ruby
 
 msg_info "Configuring PostgreSQL for Discourse"
 DISCOURSE_DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
@@ -38,8 +38,8 @@ DISCOURSE_DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
 PG_HBA="/etc/postgresql/16/main/pg_hba.conf"
 sed -i 's/^local\s\+all\s\+all\s\+peer$/local   all             all                                     md5/' "$PG_HBA"
 $STD systemctl restart postgresql
-# Create user with CREATEDB permission - Rails will create the database
-$STD sudo -u postgres psql -c "CREATE ROLE discourse WITH LOGIN PASSWORD '$DISCOURSE_DB_PASS' CREATEDB;"
+# Create user + database explicitly for reliable bootstrap
+PG_DB_NAME="discourse" PG_DB_USER="discourse" PG_DB_PASS="$DISCOURSE_DB_PASS" setup_postgresql_db
 msg_ok "Configured PostgreSQL for Discourse"
 
 msg_info "Configuring Discourse"
@@ -90,7 +90,9 @@ cd /opt/discourse
 export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
 eval "$(rbenv init - bash)" 2>/dev/null || true
 export RAILS_ENV=production
-$STD bundle exec rails db:create
+set -a
+source /opt/discourse/.env
+set +a
 $STD bundle exec rails db:migrate
 msg_ok "Set Up Database"
 
@@ -99,6 +101,9 @@ cd /opt/discourse
 export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
 eval "$(rbenv init - bash)" 2>/dev/null || true
 export RAILS_ENV=production
+set -a
+source /opt/discourse/.env
+set +a
 $STD bundle exec rails assets:precompile
 msg_ok "Built Discourse Assets"
 
@@ -107,6 +112,9 @@ cd /opt/discourse
 export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"
 eval "$(rbenv init - bash)" 2>/dev/null || true
 export RAILS_ENV=production
+set -a
+source /opt/discourse/.env
+set +a
 $STD bundle exec rails runner "User.create!(email: 'admin@local', username: 'admin', password: '${DISCOURSE_DB_PASS}', admin: true)" || true
 msg_ok "Created Discourse Admin User"
 
@@ -121,7 +129,8 @@ Type=simple
 User=root
 WorkingDirectory=/opt/discourse
 Environment=RAILS_ENV=production
-ExecStart=/usr/local/bin/bundle exec puma -w 2
+Environment=PATH=/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ExecStart=/root/.rbenv/shims/bundle exec puma -w 2
 Restart=on-failure
 RestartSec=5
 
diff --git a/install/drawio-install.sh b/install/drawio-install.sh
deleted file mode 100644
index 95f3648cc..000000000
--- a/install/drawio-install.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Slaviša Arežina (tremor021)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://www.drawio.com/
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-setup_hwaccel
-
-msg_info "Installing Dependencies"
-$STD apt install -y tomcat11
-msg_ok "Installed Dependencies"
-
-USE_ORIGINAL_FILENAME=true fetch_and_deploy_gh_release "drawio" "jgraph/drawio" "singlefile" "latest" "/var/lib/tomcat11/webapps" "draw.war"
-
-motd_ssh
-customize
-cleanup_lxc
diff --git a/install/ebusd-install.sh b/install/ebusd-install.sh
deleted file mode 100644
index 5373d2573..000000000
--- a/install/ebusd-install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: Joerg Heinemann (heinemannj)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://github.com/john30/ebusd
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing ebusd"
-fetch_and_deploy_gh_release "ebusd" "john30/ebusd" "binary" "latest" "" "ebusd-*_amd64-trixie_mqtt1.deb"
-systemctl enable -q ebusd.service
-msg_ok "Installed ebusd"
-
-motd_ssh
-customize
-cleanup_lxc
diff --git a/install/ente-install.sh b/install/ente-install.sh
index e1b9298e7..a9bb1f36d 100644
--- a/install/ente-install.sh
+++ b/install/ente-install.sh
@@ -30,14 +30,18 @@ RUST_CRATES="wasm-pack" setup_rust
 $STD rustup target add wasm32-unknown-unknown
 
 
-ENTE_CLI_VERSION=$(curl -s https://api.github.com/repos/ente-io/ente/releases | jq -r '[.[] | select(.tag_name | startswith("cli-v"))][0].tag_name')
 fetch_and_deploy_gh_release "ente-server" "ente-io/ente" "tarball" "latest" "/opt/ente"
-fetch_and_deploy_gh_release "ente-cli" "ente-io/ente" "prebuild" "$ENTE_CLI_VERSION" "/usr/local/bin" "ente-$ENTE_CLI_VERSION-linux-amd64.tar.gz"
 
-$STD mkdir -p /opt/ente/cli
+msg_info "Building Ente CLI"
+cd /opt/ente/cli
+$STD go build -o /usr/local/bin/ente .
+chmod +x /usr/local/bin/ente
+msg_ok "Built Ente CLI"
+
+$STD mkdir -p /opt/ente/cli-config
 msg_info "Configuring Ente CLI"
 cat <<EOF >>~/.bashrc
-export ENTE_CLI_SECRETS_PATH=/opt/ente/cli/secrets.txt
+export ENTE_CLI_SECRETS_PATH=/opt/ente/cli-config/secrets.txt
 export PATH="/usr/local/bin:$PATH"
 EOF
 $STD source ~/.bashrc
diff --git a/install/gramps-web-install.sh b/install/gramps-web-install.sh
new file mode 100644
index 000000000..dde886341
--- /dev/null
+++ b/install/gramps-web-install.sh
@@ -0,0 +1,129 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: GitHub Copilot
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://www.grampsweb.org/
+
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+if apt-cache show libgirepository1.0-dev >/dev/null 2>&1; then
+  GI_DEV_PACKAGE="libgirepository1.0-dev"
+elif apt-cache show libgirepository-2.0-dev >/dev/null 2>&1; then
+  GI_DEV_PACKAGE="libgirepository-2.0-dev"
+else
+  msg_error "No supported girepository development package found!"
+  exit
+fi
+
+msg_info "Installing Dependencies"
+$STD apt install -y \
+  appstream \
+  build-essential \
+  ffmpeg \
+  gettext \
+  gobject-introspection \
+  gir1.2-gexiv2-0.10 \
+  gir1.2-gtk-3.0 \
+  gir1.2-osmgpsmap-1.0 \
+  gir1.2-pango-1.0 \
+  git \
+  graphviz \
+  libcairo2-dev \
+  libglib2.0-dev \
+  libicu-dev \
+  libopencv-dev \
+  pkg-config \
+  poppler-utils \
+  python3-dev \
+  tesseract-ocr \
+  "$GI_DEV_PACKAGE"
+msg_ok "Installed Dependencies"
+
+PYTHON_VERSION="3.12" setup_uv
+NODE_VERSION="22" setup_nodejs
+
+fetch_and_deploy_gh_release "gramps-web-api" "gramps-project/gramps-web-api" "tarball" "latest" "/opt/gramps-web-api"
+fetch_and_deploy_gh_release "gramps-web" "gramps-project/gramps-web" "tarball" "latest" "/opt/gramps-web/frontend"
+
+msg_info "Setting up Gramps Web"
+mkdir -p \
+  /opt/gramps-web/config \
+  /opt/gramps-web/data/cache/export \
+  /opt/gramps-web/data/cache/persistent \
+  /opt/gramps-web/data/cache/report \
+  /opt/gramps-web/data/cache/request \
+  /opt/gramps-web/data/cache/thumbnail \
+  /opt/gramps-web/data/gramps/grampsdb \
+  /opt/gramps-web/data/indexdir \
+  /opt/gramps-web/data/media \
+  /opt/gramps-web/data/users
+
+SECRET_KEY="$(python3 -c "import secrets; print(secrets.token_urlsafe(32))")"
+
+cat <<EOF >/opt/gramps-web/config/config.cfg
+TREE="Gramps Web"
+SECRET_KEY="${SECRET_KEY}"
+BASE_URL="http://${LOCAL_IP}:5000"
+USER_DB_URI="sqlite:////opt/gramps-web/data/users/users.sqlite"
+SEARCH_INDEX_DB_URI="sqlite:////opt/gramps-web/data/indexdir/search_index.db"
+MEDIA_BASE_DIR="/opt/gramps-web/data/media"
+STATIC_PATH="/opt/gramps-web/frontend/dist"
+THUMBNAIL_CACHE_CONFIG={"CACHE_TYPE":"FileSystemCache","CACHE_DIR":"/opt/gramps-web/data/cache/thumbnail","CACHE_THRESHOLD":1000,"CACHE_DEFAULT_TIMEOUT":0}
+REQUEST_CACHE_CONFIG={"CACHE_TYPE":"FileSystemCache","CACHE_DIR":"/opt/gramps-web/data/cache/request","CACHE_THRESHOLD":1000,"CACHE_DEFAULT_TIMEOUT":0}
+PERSISTENT_CACHE_CONFIG={"CACHE_TYPE":"FileSystemCache","CACHE_DIR":"/opt/gramps-web/data/cache/persistent","CACHE_THRESHOLD":0,"CACHE_DEFAULT_TIMEOUT":0}
+REPORT_DIR="/opt/gramps-web/data/cache/report"
+EXPORT_DIR="/opt/gramps-web/data/cache/export"
+EOF
+
+$STD uv venv -c -p python3.12 /opt/gramps-web/venv
+source /opt/gramps-web/venv/bin/activate
+$STD uv pip install --no-cache-dir --upgrade pip setuptools wheel
+$STD uv pip install --no-cache-dir gunicorn
+$STD uv pip install --no-cache-dir /opt/gramps-web-api
+
+cd /opt/gramps-web/frontend
+export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
+corepack enable
+$STD npm install
+$STD npm run build
+
+GRAMPS_API_CONFIG=/opt/gramps-web/config/config.cfg \
+  GRAMPSHOME=/opt/gramps-web/data/gramps \
+  GRAMPS_DATABASE_PATH=/opt/gramps-web/data/gramps/grampsdb \
+  $STD /opt/gramps-web/venv/bin/python3 -m gramps_webapi user migrate
+msg_ok "Set up Gramps Web"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/gramps-web.service
+[Unit]
+Description=Gramps Web Service
+After=network.target
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/gramps-web-api
+Environment=GRAMPS_API_CONFIG=/opt/gramps-web/config/config.cfg
+Environment=GRAMPSHOME=/opt/gramps-web/data/gramps
+Environment=GRAMPS_DATABASE_PATH=/opt/gramps-web/data/gramps/grampsdb
+Environment=PATH=/opt/gramps-web/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ExecStart=/opt/gramps-web/venv/bin/gunicorn -w 2 -b 0.0.0.0:5000 gramps_webapi.wsgi:app --timeout 120 --limit-request-line 8190
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now gramps-web
+msg_ok "Created Service"
+
+motd_ssh
+customize
+cleanup_lxc
diff --git a/install/linkding-install.sh b/install/linkding-install.sh
deleted file mode 100644
index e893daeda..000000000
--- a/install/linkding-install.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: MickLesk (MickLesk)
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://linkding.link/
-
-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 \
-  build-essential \
-  pkg-config \
-  python3-dev \
-  nginx \
-  libpq-dev \
-  libicu-dev \
-  libsqlite3-dev \
-  libffi-dev
-msg_ok "Installed Dependencies"
-
-NODE_VERSION="22" setup_nodejs
-setup_uv
-fetch_and_deploy_gh_release "linkding" "sissbruecker/linkding"
-
-msg_info "Building Frontend"
-cd /opt/linkding
-$STD npm ci
-$STD npm run build
-ln -sf /usr/lib/x86_64-linux-gnu/mod_icu.so /opt/linkding/libicu.so
-msg_ok "Built Frontend"
-
-msg_info "Setting up linkding"
-rm -f bookmarks/settings/dev.py
-touch bookmarks/settings/custom.py
-$STD uv sync --no-dev --frozen
-$STD uv pip install gunicorn
-mkdir -p data/{favicons,previews,assets}
-ADMIN_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | cut -c1-13)
-cat <<EOF >/opt/linkding/.env
-LD_SUPERUSER_NAME=admin
-LD_SUPERUSER_PASSWORD=${ADMIN_PASS}
-LD_CSRF_TRUSTED_ORIGINS=http://${LOCAL_IP}:9090
-EOF
-set -a && source /opt/linkding/.env && set +a
-$STD /opt/linkding/.venv/bin/python manage.py generate_secret_key
-$STD /opt/linkding/.venv/bin/python manage.py migrate
-$STD /opt/linkding/.venv/bin/python manage.py enable_wal
-$STD /opt/linkding/.venv/bin/python manage.py create_initial_superuser
-$STD /opt/linkding/.venv/bin/python manage.py collectstatic --no-input
-msg_ok "Set up linkding"
-
-msg_info "Creating Services"
-cat <<EOF >/etc/systemd/system/linkding.service
-[Unit]
-Description=linkding Bookmark Manager
-After=network.target
-
-[Service]
-User=root
-WorkingDirectory=/opt/linkding
-EnvironmentFile=/opt/linkding/.env
-ExecStart=/opt/linkding/.venv/bin/gunicorn \
-  --bind 127.0.0.1:8000 \
-  --workers 3 \
-  --threads 2 \
-  --timeout 120 \
-  bookmarks.wsgi:application
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-cat <<EOF >/etc/systemd/system/linkding-tasks.service
-[Unit]
-Description=linkding Background Tasks
-After=network.target
-
-[Service]
-User=root
-WorkingDirectory=/opt/linkding
-EnvironmentFile=/opt/linkding/.env
-ExecStart=/opt/linkding/.venv/bin/python manage.py run_huey
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-cat <<'EOF' >/etc/nginx/sites-available/linkding
-server {
-    listen 9090;
-    server_name _;
-
-    client_max_body_size 20M;
-
-    location /static/ {
-        alias /opt/linkding/static/;
-        expires 30d;
-    }
-
-    location / {
-        proxy_pass http://127.0.0.1:8000;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_redirect off;
-    }
-}
-EOF
-$STD rm -f /etc/nginx/sites-enabled/default
-$STD ln -sf /etc/nginx/sites-available/linkding /etc/nginx/sites-enabled/linkding
-systemctl enable -q --now nginx linkding linkding-tasks
-systemctl restart nginx
-msg_ok "Created Services"
-
-motd_ssh
-customize
-cleanup_lxc
diff --git a/install/nextexplorer-install.sh b/install/nextexplorer-install.sh
index 2ba58e932..34770db9a 100644
--- a/install/nextexplorer-install.sh
+++ b/install/nextexplorer-install.sh
@@ -63,6 +63,8 @@ PUBLIC_URL=${LOCAL_IP}:3000
 # TRUST_PROXY=
 # CORS_ORIGINS=
 
+TERMINAL_ENABLED=false
+
 LOG_LEVEL=info
 DEBUG=false
 ENABLE_HTTP_LOGGING=false
diff --git a/install/papra-install.sh b/install/papra-install.sh
index 530dbc408..1a32763ba 100644
--- a/install/papra-install.sh
+++ b/install/papra-install.sh
@@ -20,7 +20,7 @@ $STD apt-get install -y \
   tesseract-ocr-all
 msg_ok "Installed Dependencies"
 
-RELEASE=$(curl -fsSL https://api.github.com/repos/papra-hq/papra/releases | grep -oP '"tag_name":\s*"\K@papra/docker@[^"]+' | head -n1)
+RELEASE=$(curl -fsSL https://api.github.com/repos/papra-hq/papra/releases | grep -oP '"tag_name":\s*"\K@papra/app@[^"]+' | head -n1)
 fetch_and_deploy_gh_release "papra" "papra-hq/papra" "tarball" "${RELEASE}" "/opt/papra"
 
 pnpm_version=$(grep -oP '"packageManager":\s*"pnpm@\K[^"]+' /opt/papra/package.json)
diff --git a/install/romm-install.sh b/install/romm-install.sh
deleted file mode 100644
index 78afba5a4..000000000
--- a/install/romm-install.sh
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: DevelopmentCats
-# Co-author: AlphaLawless
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://romm.app
-# Updated: 25/12/2025
-
-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 \
-  acl \
-  git \
-  build-essential \
-  libssl-dev \
-  libffi-dev \
-  libmagic-dev \
-  python3-dev \
-  python3-pip \
-  python3-venv \
-  libmariadb3 \
-  libmariadb-dev \
-  libpq-dev \
-  libbz2-dev \
-  libreadline-dev \
-  libsqlite3-dev \
-  zlib1g-dev \
-  liblzma-dev \
-  libncurses5-dev \
-  libncursesw5-dev \
-  redis-server \
-  redis-tools \
-  p7zip-full \
-  tzdata \
-  nginx
-msg_ok "Installed Dependencies"
-
-PYTHON_VERSION="3.13" setup_uv
-NODE_VERSION="22" setup_nodejs
-setup_mariadb
-MARIADB_DB_NAME="romm" MARIADB_DB_USER="romm" setup_mariadb_db
-
-msg_info "Creating directories"
-mkdir -p /opt/romm \
-  /var/lib/romm/config \
-  /var/lib/romm/resources \
-  /var/lib/romm/assets/{saves,states,screenshots} \
-  /var/lib/romm/library/roms \
-  /var/lib/romm/library/bios
-msg_ok "Created directories"
-
-msg_info "Creating configuration file"
-cat <<'EOF' >/var/lib/romm/config/config.yml
-# RomM Configuration File
-# Documentation: https://docs.romm.app/latest/Getting-Started/Configuration-File/
-# Only uncomment the lines you want to use/modify
-
-# exclude:
-#   platforms:
-#     - excluded_folder_a
-#   roms:
-#     single_file:
-#       extensions:
-#         - xml
-#         - txt
-#       names:
-#         - '._*'
-#         - '*.nfo'
-#     multi_file:
-#       names:
-#         - downloaded_media
-#         - media
-
-# system:
-#   platforms:
-#     gc: ngc
-#     ps1: psx
-
-# The folder name where your roms are located (relative to library path)
-# filesystem:
-#   roms_folder: 'roms'
-
-# scan:
-#   priority:
-#     metadata:
-#       - "igdb"
-#       - "moby"
-#       - "ss"
-#       - "ra"
-#     artwork:
-#       - "igdb"
-#       - "moby"
-#       - "ss"
-#     region:
-#       - "us"
-#       - "eu"
-#       - "jp"
-#     language:
-#       - "en"
-#   media:
-#     - box2d
-#     - box3d
-#     - screenshot
-#     - manual
-
-# emulatorjs:
-#   debug: false
-#   cache_limit: null
-EOF
-chmod 644 /var/lib/romm/config/config.yml
-msg_ok "Created configuration file"
-
-fetch_and_deploy_gh_release "RAHasher" "RetroAchievements/RALibretro" "prebuild" "latest" "/opt/RALibretro" "RAHasher-x64-Linux-*.zip"
-cp /opt/RALibretro/RAHasher /usr/bin/RAHasher
-chmod +x /usr/bin/RAHasher
-
-fetch_and_deploy_gh_release "romm" "rommapp/romm"
-
-msg_info "Creating environment file"
-sed -i 's/^supervised no/supervised systemd/' /etc/redis/redis.conf
-systemctl restart redis-server
-systemctl enable -q --now redis-server
-AUTH_SECRET_KEY=$(openssl rand -hex 32)
-
-cat <<EOF >/opt/romm/.env
-ROMM_BASE_PATH=/var/lib/romm
-ROMM_CONFIG_PATH=/var/lib/romm/config/config.yml
-WEB_CONCURRENCY=4
-
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_NAME=$MARIADB_DB_NAME
-DB_USER=$MARIADB_DB_USER
-DB_PASSWD=$MARIADB_DB_PASS
-
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-
-ROMM_AUTH_SECRET_KEY=$AUTH_SECRET_KEY
-DISABLE_DOWNLOAD_ENDPOINT_AUTH=false
-DISABLE_CSRF_PROTECTION=false
-
-ENABLE_RESCAN_ON_FILESYSTEM_CHANGE=true
-RESCAN_ON_FILESYSTEM_CHANGE_DELAY=5
-
-ENABLE_SCHEDULED_RESCAN=true
-SCHEDULED_RESCAN_CRON=0 3 * * *
-ENABLE_SCHEDULED_UPDATE_SWITCH_TITLEDB=true
-SCHEDULED_UPDATE_SWITCH_TITLEDB_CRON=0 4 * * *
-
-LOGLEVEL=INFO
-EOF
-
-chmod 600 /opt/romm/.env
-msg_ok "Created environment file"
-
-msg_info "Setting up RomM Backend"
-cd /opt/romm
-export UV_CONCURRENT_DOWNLOADS=1
-$STD uv sync --all-extras
-cd /opt/romm/backend
-$STD uv run alembic upgrade head
-msg_ok "Set up RomM Backend"
-
-msg_info "Setting up RomM Frontend"
-cd /opt/romm/frontend
-$STD npm install
-$STD npm run build
-
-cp -rf /opt/romm/frontend/assets/* /opt/romm/frontend/dist/assets/
-
-mkdir -p /opt/romm/frontend/dist/assets/romm
-ln -sfn /var/lib/romm/resources /opt/romm/frontend/dist/assets/romm/resources
-ln -sfn /var/lib/romm/assets /opt/romm/frontend/dist/assets/romm/assets
-msg_ok "Set up RomM Frontend"
-
-msg_info "Configuring Nginx"
-cat <<'EOF' >/etc/nginx/sites-available/romm
-upstream romm_backend {
-    server 127.0.0.1:5000;
-}
-
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
-
-server {
-    listen 80;
-    server_name _;
-    root /opt/romm/frontend/dist;
-    client_max_body_size 0;
-
-    # Frontend SPA
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    # Static assets
-    location /assets {
-        alias /opt/romm/frontend/dist/assets;
-        try_files $uri $uri/ =404;
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-    }
-
-    # EmulatorJS player - requires COOP/COEP headers for SharedArrayBuffer
-    location ~ ^/rom/.*/ejs$ {
-        add_header Cross-Origin-Embedder-Policy "require-corp";
-        add_header Cross-Origin-Opener-Policy "same-origin";
-        try_files $uri /index.html;
-    }
-
-    # Backend API
-    location /api {
-        proxy_pass http://romm_backend;
-        proxy_buffering off;
-        proxy_request_buffering off;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-    }
-
-    # WebSocket and Netplay
-    location ~ ^/(ws|netplay) {
-        proxy_pass http://romm_backend;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $host;
-        proxy_read_timeout 86400;
-    }
-
-    # OpenAPI docs
-    location = /openapi.json {
-        proxy_pass http://romm_backend;
-    }
-
-    # Internal library file serving
-    location /library/ {
-        internal;
-        alias /var/lib/romm/library/;
-    }
-}
-EOF
-
-rm -f /etc/nginx/sites-enabled/default
-ln -sf /etc/nginx/sites-available/romm /etc/nginx/sites-enabled/romm
-systemctl restart nginx
-systemctl enable -q --now nginx
-msg_ok "Configured Nginx"
-
-msg_info "Creating Services"
-cat <<EOF >/etc/systemd/system/romm-backend.service
-[Unit]
-Description=RomM Backend
-After=network.target mariadb.service redis-server.service
-Requires=mariadb.service redis-server.service
-
-[Service]
-Type=simple
-WorkingDirectory=/opt/romm/backend
-EnvironmentFile=/opt/romm/.env
-Environment="PYTHONPATH=/opt/romm"
-ExecStart=/opt/romm/.venv/bin/python main.py
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-cat <<EOF >/etc/systemd/system/romm-worker.service
-[Unit]
-Description=RomM RQ Worker
-After=network.target mariadb.service redis-server.service romm-backend.service
-Requires=mariadb.service redis-server.service
-
-[Service]
-Type=simple
-WorkingDirectory=/opt/romm/backend
-EnvironmentFile=/opt/romm/.env
-Environment="PYTHONPATH=/opt/romm/backend"
-ExecStart=/opt/romm/.venv/bin/rq worker --path /opt/romm/backend --url redis://127.0.0.1:6379/0 high default low
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-cat <<EOF >/etc/systemd/system/romm-scheduler.service
-[Unit]
-Description=RomM RQ Scheduler
-After=network.target mariadb.service redis-server.service romm-backend.service
-Requires=mariadb.service redis-server.service
-
-[Service]
-Type=simple
-WorkingDirectory=/opt/romm/backend
-EnvironmentFile=/opt/romm/.env
-Environment="PYTHONPATH=/opt/romm/backend"
-Environment="RQ_REDIS_HOST=127.0.0.1"
-Environment="RQ_REDIS_PORT=6379"
-ExecStart=/opt/romm/.venv/bin/rqscheduler --path /opt/romm/backend
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-cat <<EOF >/etc/systemd/system/romm-watcher.service
-[Unit]
-Description=RomM Filesystem Watcher
-After=network.target romm-backend.service
-Requires=romm-backend.service
-
-[Service]
-Type=simple
-WorkingDirectory=/opt/romm/backend
-EnvironmentFile=/opt/romm/.env
-Environment="PYTHONPATH=/opt/romm/backend"
-ExecStart=/opt/romm/.venv/bin/watchfiles --target-type command '/opt/romm/.venv/bin/python watcher.py' /var/lib/romm/library
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-systemctl enable -q --now romm-backend romm-worker romm-scheduler romm-watcher
-msg_ok "Created Services"
-
-motd_ssh
-customize
-cleanup_lxc
diff --git a/install/seer-install.sh b/install/seer-install.sh
deleted file mode 100644
index bda0ca80c..000000000
--- a/install/seer-install.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021-2026 community-scripts ORG
-# Author: CrazyWolf13
-# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
-# Source: https://docs.seerr.dev/
-
-source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
-color
-verb_ip6
-catch_errors
-setting_up_container
-network_check
-update_os
-
-msg_info "Installing Dependencies"
-$STD apt-get install -y build-essential
-msg_ok "Installed Dependencies"
-
-fetch_and_deploy_gh_release "seer" "seerr-team/seerr" "tarball" "latest"
-
-pnpm_desired=$(grep -Po '"pnpm":\s*"\K[^"]+' /opt/seer/package.json)
-NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
-
-msg_info "Installing Seer (Patience)"
-export CYPRESS_INSTALL_BINARY=0
-cd /opt/seer
-$STD pnpm install --frozen-lockfile
-export NODE_OPTIONS="--max-old-space-size=3072"
-$STD pnpm build
-mkdir -p /etc/seer/
-cat <<EOF >/etc/seer/seer.conf
-## Seer's default port is 5055, if you want to use both, change this.
-## specify on which port to listen
-PORT=5055
-
-## specify on which interface to listen, by default seer listens on all interfaces
-HOST=0.0.0.0
-
-## Uncomment if you want to force Node.js to resolve IPv4 before IPv6 (advanced users only)
-# FORCE_IPV4_FIRST=true
-EOF
-msg_ok "Installed Seer"
-
-msg_info "Creating Service"
-cat <<EOF >/etc/systemd/system/seer.service
-[Unit]
-Description=Seer Service
-After=network.target
-
-[Service]
-EnvironmentFile=/etc/seer/seer.conf
-Environment=NODE_ENV=production
-Type=exec
-WorkingDirectory=/opt/seer
-ExecStart=/usr/bin/node dist/index.js
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now seer
-msg_ok "Created Service"
-
-motd_ssh
-customize
-cleanup_lxc
diff --git a/install/split-pro-install.sh b/install/split-pro-install.sh
new file mode 100644
index 000000000..7d33df8e2
--- /dev/null
+++ b/install/split-pro-install.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: johanngrobe
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/oss-apps/split-pro
+
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
+PG_VERSION="17" setup_postgresql
+
+msg_info "Installing Dependencies"
+$STD apt install -y \
+  openssl \
+  postgresql-17-cron
+msg_ok "Installed Dependencies"
+
+PG_DB_NAME="splitpro" PG_DB_USER="splitpro" setup_postgresql_db
+
+msg_info "Setting up pg_cron"
+sed -i "/^#shared_preload_libraries/s/^#//" /etc/postgresql/17/main/postgresql.conf
+sed -i "/^shared_preload_libraries/s/''/pg_cron/" /etc/postgresql/17/main/postgresql.conf
+systemctl restart postgresql
+$STD sudo -u postgres psql -c "ALTER SYSTEM SET cron.database_name = 'splitpro'"
+$STD sudo -u postgres psql -c "ALTER SYSTEM SET cron.timezone = 'UTC'"
+systemctl restart postgresql
+$STD sudo -u postgres psql -d splitpro -c "CREATE EXTENSION IF NOT EXISTS pg_cron"
+$STD sudo -u postgres psql -d splitpro -c "GRANT USAGE ON SCHEMA cron TO splitpro"
+$STD sudo -u postgres psql -d splitpro -c "GRANT ALL ON ALL TABLES IN SCHEMA cron TO splitpro"
+msg_ok "Setup pg_cron complete"
+
+fetch_and_deploy_gh_release "split-pro" "oss-apps/split-pro" "tarball" "latest" "/opt/split-pro"
+
+msg_info "Installing Dependencies"
+cd /opt/split-pro
+$STD pnpm install --frozen-lockfile
+msg_ok "Installed Dependencies"
+
+msg_info "Building Split Pro"
+cd /opt/split-pro
+mkdir -p /opt/split-pro_data/uploads
+ln -sf /opt/split-pro_data/uploads /opt/split-pro/uploads
+NEXTAUTH_SECRET=$(openssl rand -base64 32)
+cp .env.example .env
+sed -i "s|^DATABASE_URL=.*|DATABASE_URL=\"postgresql://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME}\"|" .env
+sed -i "s|^NEXTAUTH_SECRET=.*|NEXTAUTH_SECRET=\"${NEXTAUTH_SECRET}\"|" .env
+sed -i "s|^NEXTAUTH_URL=.*|NEXTAUTH_URL=\"http://${LOCAL_IP}:3000\"|" .env
+sed -i "s|^NEXTAUTH_URL_INTERNAL=.*|NEXTAUTH_URL_INTERNAL=\"http://localhost:3000\"|" .env
+sed -i "/^POSTGRES_CONTAINER_NAME=/d" .env
+sed -i "/^POSTGRES_USER=/d" .env
+sed -i "/^POSTGRES_PASSWORD=/d" .env
+sed -i "/^POSTGRES_DB=/d" .env
+sed -i "/^POSTGRES_PORT=/d" .env
+$STD pnpm build
+$STD pnpm exec prisma migrate deploy
+msg_ok "Built Split Pro"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/split-pro.service
+[Unit]
+Description=Split Pro
+After=network.target postgresql.service
+Requires=postgresql.service
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/split-pro
+EnvironmentFile=/opt/split-pro/.env
+ExecStart=/usr/bin/pnpm start
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now split-pro
+msg_ok "Created Service"
+
+motd_ssh
+customize
+cleanup_lxc
diff --git a/install/sure-install.sh b/install/sure-install.sh
new file mode 100644
index 000000000..d270bef75
--- /dev/null
+++ b/install/sure-install.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: vhsdream
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+# Source: https://sure.am
+
+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 \
+  build-essential \
+  redis-server \
+  pkg-config \
+  libpq-dev \
+  libvips
+msg_ok "Installed Dependencies"
+
+fetch_and_deploy_gh_release "Sure" "we-promise/sure" "tarball" "latest" "/opt/sure"
+
+PG_VERSION="$(sed -n '/postgres:/s/[^[:digit:]]*//p' /opt/sure/compose.example.yml)" setup_postgresql
+PG_DB_NAME=sure_production PG_DB_USER=sure_user setup_postgresql_db
+RUBY_VERSION="$(cat /opt/sure/.ruby-version)" RUBY_INSTALL_RAILS=false setup_ruby
+
+msg_info "Building Sure"
+cd /opt/sure
+export RAILS_ENV=production
+export BUNDLE_DEPLOYMENT=1
+export BUNDLE_WITHOUT=development
+$STD ./bin/bundle install
+$STD ./bin/bundle exec bootsnap precompile --gemfile -j 0
+$STD ./bin/bundle exec bootsnap precompile -j 0 app/ lib/
+export SECRET_KEY_BASE_DUMMY=1 && $STD ./bin/rails assets:precompile
+unset SECRET_KEY_BASE_DUMMY
+msg_ok "Built Sure"
+
+msg_info "Configuring Sure"
+KEY="$(openssl rand -hex 64)"
+mkdir -p /etc/sure
+mv /opt/sure/.env.example /etc/sure/.env
+sed -i -e "/^SECRET_KEY_BASE=/s/secret-value/${KEY}/" \
+  -e 's/_KEY_BASE=.*$/&\n\nRAILS_FORCE_SSL=false \
+\
+# Change to true when using a reverse proxy \
+RAILS_ASSUME_SSL=false/' \
+  -e "/POSTGRES_PASSWORD=/s/postgres/${PG_DB_PASS}/" \
+  -e "/POSTGRES_USER=/s/postgres/${PG_DB_USER}\\
+POSTGRES_DB=${PG_DB_NAME}/" \
+  -e "s|^APP_DOMAIN=|&${LOCAL_IP}|" /etc/sure/.env
+msg_ok "Configured Sure"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/sure.service
+[Unit]
+Description=Sure Service
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/opt/sure
+Environment=RAILS_ENV=production
+Environment=BUNDLE_DEPLOYMENT=1
+Environment=BUNDLE_WITHOUT=development
+Environment=PATH=/root/.rbenv/shims:/root/.rbenv/bin:/usr/bin:\$PATH
+EnvironmentFile=/etc/sure/.env
+ExecStartPre=/opt/sure/bin/rails db:prepare
+ExecStart=/opt/sure/bin/rails server
+Restart=always
+RestartSec=5
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+$STD systemctl enable -q --now sure
+msg_ok "Created Service"
+
+motd_ssh
+customize
+cleanup_lxc
diff --git a/misc/api.func b/misc/api.func
index 7d02a7912..4a554ecfc 100644
--- a/misc/api.func
+++ b/misc/api.func
@@ -1,6 +1,6 @@
 # Copyright (c) 2021-2026 community-scripts ORG
-# Author: michelroegl-brunner
-# License: MIT | https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/LICENSE
+# Author: michelroegl-brunner | MickLesk
+# License: MIT | https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/LICENSE
 
 # ==============================================================================
 # API.FUNC - TELEMETRY & DIAGNOSTICS API
@@ -37,9 +37,74 @@ TELEMETRY_URL="https://telemetry.community-scripts.org/telemetry"
 # Timeout for telemetry requests (seconds)
 TELEMETRY_TIMEOUT=5
 
-# Repository source identifier (auto-transformed by CI on promotion to ProxmoxVE)
-# DO NOT CHANGE - this is used by the telemetry service to route data to the correct collection
-REPO_SOURCE="community-scripts/ProxmoxVED"
+# ==============================================================================
+# SECTION 0: REPOSITORY SOURCE DETECTION
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# detect_repo_source()
+#
+# - Dynamically detects which GitHub/Gitea repo the scripts were loaded from
+# - Inspects /proc/$$/cmdline and $0 to find the source URL
+# - Maps detected repo to one of three canonical values:
+#   * "ProxmoxVE"  — official community-scripts/ProxmoxVE (production)
+#   * "ProxmoxVED" — official community-scripts/ProxmoxVED (development)
+#   * "external"   — any fork or unknown source
+# - Fallback: "ProxmoxVED" (CI sed transforms ProxmoxVED → ProxmoxVE on promotion)
+# - Sets and exports REPO_SOURCE global variable
+# - Skips detection if REPO_SOURCE is already set (e.g., by environment)
+# ------------------------------------------------------------------------------
+detect_repo_source() {
+  # Allow explicit override via environment
+  [[ -n "${REPO_SOURCE:-}" ]] && return 0
+
+  local content="" owner_repo=""
+
+  # Method 1: Read from /proc/$$/cmdline
+  # When invoked via: bash -c "$(curl -fsSL https://.../ct/app.sh)"
+  # the full CT/VM script content is in /proc/$$/cmdline (same PID through source chain)
+  if [[ -r /proc/$$/cmdline ]]; then
+    content=$(tr '\0' ' ' </proc/$$/cmdline 2>/dev/null) || true
+  fi
+
+  # Method 2: Read from the original script file (bash ct/app.sh / bash vm/app.sh)
+  if [[ -z "$content" ]] || ! echo "$content" | grep -qE 'githubusercontent\.com|community-scripts\.org' 2>/dev/null; then
+    if [[ -f "$0" ]] && [[ "$0" != *bash* ]]; then
+      content=$(head -10 "$0" 2>/dev/null) || true
+    fi
+  fi
+
+  # Extract owner/repo from URL patterns found in the script content
+  if [[ -n "$content" ]]; then
+    # GitHub raw URL: raw.githubusercontent.com/OWNER/REPO/...
+    owner_repo=$(echo "$content" | grep -oE 'raw\.githubusercontent\.com/[^/]+/[^/]+' | head -1 | sed 's|raw\.githubusercontent\.com/||') || true
+
+    # Gitea URL: git.community-scripts.org/OWNER/REPO/...
+    if [[ -z "$owner_repo" ]]; then
+      owner_repo=$(echo "$content" | grep -oE 'git\.community-scripts\.org/[^/]+/[^/]+' | head -1 | sed 's|git\.community-scripts\.org/||') || true
+    fi
+  fi
+
+  # Map detected owner/repo to canonical repo_source value
+  case "$owner_repo" in
+  community-scripts/ProxmoxVE) REPO_SOURCE="ProxmoxVE" ;;
+  community-scripts/ProxmoxVED) REPO_SOURCE="ProxmoxVED" ;;
+  "")
+    # No URL detected — use hardcoded fallback
+    # CI sed transforms this on promotion: ProxmoxVED → ProxmoxVE
+    REPO_SOURCE="ProxmoxVED"
+    ;;
+  *)
+    # Fork or unknown repo
+    REPO_SOURCE="external"
+    ;;
+  esac
+
+  export REPO_SOURCE
+}
+
+# Run detection immediately when api.func is sourced
+detect_repo_source
 
 # ==============================================================================
 # SECTION 1: ERROR CODE DESCRIPTIONS
@@ -88,7 +153,7 @@ explain_exit_code() {
   126) echo "Command invoked cannot execute (permission problem?)" ;;
   127) echo "Command not found" ;;
   128) echo "Invalid argument to exit" ;;
-  130) echo "Terminated by Ctrl+C (SIGINT)" ;;
+  130) echo "Aborted by user (SIGINT)" ;;
   134) echo "Process aborted (SIGABRT - possibly Node.js heap overflow)" ;;
   137) echo "Killed (SIGKILL / Out of memory?)" ;;
   139) echo "Segmentation fault (core dumped)" ;;
@@ -168,6 +233,60 @@ explain_exit_code() {
   esac
 }
 
+# ------------------------------------------------------------------------------
+# json_escape()
+#
+# - Escapes a string for safe JSON embedding
+# - Handles backslashes, quotes, newlines, tabs, and carriage returns
+# ------------------------------------------------------------------------------
+json_escape() {
+  local s="$1"
+  s=${s//\\/\\\\}
+  s=${s//"/\\"/}
+  s=${s//$'\n'/\\n}
+  s=${s//$'\r'/}
+  s=${s//$'\t'/\\t}
+  echo "$s"
+}
+
+# ------------------------------------------------------------------------------
+# get_error_text()
+#
+# - Returns last 20 lines of the active log (INSTALL_LOG or BUILD_LOG)
+# - Falls back to combined log or BUILD_LOG if primary is not accessible
+# - Handles container paths that don't exist on the host
+# ------------------------------------------------------------------------------
+get_error_text() {
+  local logfile=""
+  if declare -f get_active_logfile >/dev/null 2>&1; then
+    logfile=$(get_active_logfile)
+  elif [[ -n "${INSTALL_LOG:-}" ]]; then
+    logfile="$INSTALL_LOG"
+  elif [[ -n "${BUILD_LOG:-}" ]]; then
+    logfile="$BUILD_LOG"
+  fi
+
+  # If logfile is inside container (e.g. /root/.install-*), try the host copy
+  if [[ -n "$logfile" && ! -s "$logfile" ]]; then
+    # Try combined log: /tmp/<app>-<CTID>-<SESSION_ID>.log
+    if [[ -n "${CTID:-}" && -n "${SESSION_ID:-}" ]]; then
+      local combined_log="/tmp/${NSAPP:-lxc}-${CTID}-${SESSION_ID}.log"
+      if [[ -s "$combined_log" ]]; then
+        logfile="$combined_log"
+      fi
+    fi
+  fi
+
+  # Also try BUILD_LOG as fallback if primary log is empty/missing
+  if [[ -z "$logfile" || ! -s "$logfile" ]] && [[ -n "${BUILD_LOG:-}" && -s "${BUILD_LOG}" ]]; then
+    logfile="$BUILD_LOG"
+  fi
+
+  if [[ -n "$logfile" && -s "$logfile" ]]; then
+    tail -n 20 "$logfile" 2>/dev/null | sed 's/\r$//'
+  fi
+}
+
 # ==============================================================================
 # SECTION 2: TELEMETRY FUNCTIONS
 # ==============================================================================
@@ -288,6 +407,9 @@ detect_ram() {
 # - Never blocks or fails script execution
 # ------------------------------------------------------------------------------
 post_to_api() {
+  # Prevent duplicate submissions (post_to_api is called from multiple places)
+  [[ "${POST_TO_API_DONE:-}" == "true" ]] && return 0
+
   # Silent fail - telemetry should never break scripts
   command -v curl &>/dev/null || {
     [[ "${DEV_MODE:-}" == "true" ]] && echo "[DEBUG] curl not found, skipping" >&2
@@ -317,7 +439,8 @@ post_to_api() {
     detect_gpu
   fi
   local gpu_vendor="${GPU_VENDOR:-unknown}"
-  local gpu_model="${GPU_MODEL:-}"
+  local gpu_model
+  gpu_model=$(json_escape "${GPU_MODEL:-}")
   local gpu_passthrough="${GPU_PASSTHROUGH:-unknown}"
 
   # Detect CPU if not already set
@@ -325,7 +448,8 @@ post_to_api() {
     detect_cpu
   fi
   local cpu_vendor="${CPU_VENDOR:-unknown}"
-  local cpu_model="${CPU_MODEL:-}"
+  local cpu_model
+  cpu_model=$(json_escape "${CPU_MODEL:-}")
 
   # Detect RAM if not already set
   if [[ -z "${RAM_SPEED:-}" ]]; then
@@ -375,6 +499,8 @@ EOF
       -H "Content-Type: application/json" \
       -d "$JSON_PAYLOAD" &>/dev/null || true
   fi
+
+  POST_TO_API_DONE=true
 }
 
 # ------------------------------------------------------------------------------
@@ -386,6 +512,7 @@ EOF
 #   * ct_type=2 (VM instead of LXC)
 #   * type="vm"
 #   * Disk size without 'G' suffix
+# - Includes hardware detection: CPU, GPU, RAM speed
 # - Only executes if DIAGNOSTICS=yes and RANDOM_UUID is set
 # - Never blocks or fails script execution
 # ------------------------------------------------------------------------------
@@ -408,6 +535,29 @@ post_to_api_vm() {
     pve_version=$(pveversion 2>/dev/null | awk -F'[/ ]' '{print $2}') || true
   fi
 
+  # Detect GPU if not already set
+  if [[ -z "${GPU_VENDOR:-}" ]]; then
+    detect_gpu
+  fi
+  local gpu_vendor="${GPU_VENDOR:-unknown}"
+  local gpu_model
+  gpu_model=$(json_escape "${GPU_MODEL:-}")
+  local gpu_passthrough="${GPU_PASSTHROUGH:-unknown}"
+
+  # Detect CPU if not already set
+  if [[ -z "${CPU_VENDOR:-}" ]]; then
+    detect_cpu
+  fi
+  local cpu_vendor="${CPU_VENDOR:-unknown}"
+  local cpu_model
+  cpu_model=$(json_escape "${CPU_MODEL:-}")
+
+  # Detect RAM if not already set
+  if [[ -z "${RAM_SPEED:-}" ]]; then
+    detect_ram
+  fi
+  local ram_speed="${RAM_SPEED:-}"
+
   # Remove 'G' suffix from disk size
   local DISK_SIZE_API="${DISK_SIZE%G}"
 
@@ -427,6 +577,12 @@ post_to_api_vm() {
     "os_version": "${var_version:-}",
     "pve_version": "${pve_version}",
     "method": "${METHOD:-default}",
+    "cpu_vendor": "${cpu_vendor}",
+    "cpu_model": "${cpu_model}",
+    "gpu_vendor": "${gpu_vendor}",
+    "gpu_model": "${gpu_model}",
+    "gpu_passthrough": "${gpu_passthrough}",
+    "ram_speed": "${ram_speed}",
     "repo_source": "${REPO_SOURCE}"
 }
 EOF
@@ -457,9 +613,12 @@ post_update_to_api() {
   # Silent fail - telemetry should never break scripts
   command -v curl &>/dev/null || return 0
 
-  # Prevent duplicate submissions
+  # Support "force" mode (3rd arg) to bypass duplicate check for retries after cleanup
+  local force="${3:-}"
   POST_UPDATE_DONE=${POST_UPDATE_DONE:-false}
-  [[ "$POST_UPDATE_DONE" == "true" ]] && return 0
+  if [[ "$POST_UPDATE_DONE" == "true" && "$force" != "force" ]]; then
+    return 0
+  fi
 
   [[ "${DIAGNOSTICS:-no}" == "no" ]] && return 0
   [[ -z "${RANDOM_UUID:-}" ]] && return 0
@@ -470,12 +629,14 @@ post_update_to_api() {
 
   # Get GPU info (if detected)
   local gpu_vendor="${GPU_VENDOR:-unknown}"
-  local gpu_model="${GPU_MODEL:-}"
+  local gpu_model
+  gpu_model=$(json_escape "${GPU_MODEL:-}")
   local gpu_passthrough="${GPU_PASSTHROUGH:-unknown}"
 
   # Get CPU info (if detected)
   local cpu_vendor="${CPU_VENDOR:-unknown}"
-  local cpu_model="${CPU_MODEL:-}"
+  local cpu_model
+  cpu_model=$(json_escape "${CPU_MODEL:-}")
 
   # Get RAM info (if detected)
   local ram_speed="${RAM_SPEED:-}"
@@ -497,13 +658,21 @@ post_update_to_api() {
   esac
 
   # For failed/unknown status, resolve exit code and error description
+  local short_error=""
   if [[ "$pb_status" == "failed" ]] || [[ "$pb_status" == "unknown" ]]; then
     if [[ "$raw_exit_code" =~ ^[0-9]+$ ]]; then
       exit_code="$raw_exit_code"
     else
       exit_code=1
     fi
-    error=$(explain_exit_code "$exit_code")
+    local error_text=""
+    error_text=$(get_error_text)
+    if [[ -n "$error_text" ]]; then
+      error=$(json_escape "$error_text")
+    else
+      error=$(json_escape "$(explain_exit_code "$exit_code")")
+    fi
+    short_error=$(json_escape "$(explain_exit_code "$exit_code")")
     error_category=$(categorize_error "$exit_code")
     [[ -z "$error" ]] && error="Unknown error"
   fi
@@ -520,8 +689,9 @@ post_update_to_api() {
     pve_version=$(pveversion 2>/dev/null | awk -F'[/ ]' '{print $2}') || true
   fi
 
-  # Full payload including all fields - allows record creation if initial call failed
-  # The Go service will find the record by random_id and PATCH, or create if not found
+  local http_code=""
+
+  # ── Attempt 1: Full payload with complete error text ──
   local JSON_PAYLOAD
   JSON_PAYLOAD=$(
     cat <<EOF
@@ -553,11 +723,80 @@ post_update_to_api() {
 EOF
   )
 
-  # Fire-and-forget: never block, never fail
+  http_code=$(curl -sS -w "%{http_code}" -m "${TELEMETRY_TIMEOUT}" -X POST "${TELEMETRY_URL}" \
+    -H "Content-Type: application/json" \
+    -d "$JSON_PAYLOAD" -o /dev/null 2>/dev/null) || http_code="000"
+
+  if [[ "$http_code" =~ ^2[0-9]{2}$ ]]; then
+    POST_UPDATE_DONE=true
+    return 0
+  fi
+
+  # ── Attempt 2: Short error text (no full log) ──
+  sleep 1
+  local RETRY_PAYLOAD
+  RETRY_PAYLOAD=$(
+    cat <<EOF
+{
+    "random_id": "${RANDOM_UUID}",
+    "type": "${TELEMETRY_TYPE:-lxc}",
+    "nsapp": "${NSAPP:-unknown}",
+    "status": "${pb_status}",
+    "ct_type": ${CT_TYPE:-1},
+    "disk_size": ${DISK_SIZE:-0},
+    "core_count": ${CORE_COUNT:-0},
+    "ram_size": ${RAM_SIZE:-0},
+    "os_type": "${var_os:-}",
+    "os_version": "${var_version:-}",
+    "pve_version": "${pve_version}",
+    "method": "${METHOD:-default}",
+    "exit_code": ${exit_code},
+    "error": "${short_error}",
+    "error_category": "${error_category}",
+    "install_duration": ${duration},
+    "cpu_vendor": "${cpu_vendor}",
+    "cpu_model": "${cpu_model}",
+    "gpu_vendor": "${gpu_vendor}",
+    "gpu_model": "${gpu_model}",
+    "gpu_passthrough": "${gpu_passthrough}",
+    "ram_speed": "${ram_speed}",
+    "repo_source": "${REPO_SOURCE}"
+}
+EOF
+  )
+
+  http_code=$(curl -sS -w "%{http_code}" -m "${TELEMETRY_TIMEOUT}" -X POST "${TELEMETRY_URL}" \
+    -H "Content-Type: application/json" \
+    -d "$RETRY_PAYLOAD" -o /dev/null 2>/dev/null) || http_code="000"
+
+  if [[ "$http_code" =~ ^2[0-9]{2}$ ]]; then
+    POST_UPDATE_DONE=true
+    return 0
+  fi
+
+  # ── Attempt 3: Minimal payload (bare minimum to set status) ──
+  sleep 2
+  local MINIMAL_PAYLOAD
+  MINIMAL_PAYLOAD=$(
+    cat <<EOF
+{
+    "random_id": "${RANDOM_UUID}",
+    "type": "${TELEMETRY_TYPE:-lxc}",
+    "nsapp": "${NSAPP:-unknown}",
+    "status": "${pb_status}",
+    "exit_code": ${exit_code},
+    "error": "${short_error}",
+    "error_category": "${error_category}",
+    "install_duration": ${duration}
+}
+EOF
+  )
+
   curl -sS -w "%{http_code}" -m "${TELEMETRY_TIMEOUT}" -X POST "${TELEMETRY_URL}" \
     -H "Content-Type: application/json" \
-    -d "$JSON_PAYLOAD" -o /dev/null 2>&1 || true
+    -d "$MINIMAL_PAYLOAD" -o /dev/null 2>/dev/null || true
 
+  # Tried 3 times - mark as done regardless to prevent infinite loops
   POST_UPDATE_DONE=true
 }
 
@@ -593,6 +832,9 @@ categorize_error() {
   # Configuration errors
   203 | 204 | 205 | 206 | 207 | 208) echo "config" ;;
 
+  # Aborted by user
+  130) echo "aborted" ;;
+
   # Resource errors (OOM, etc)
   137 | 134) echo "resource" ;;
 
@@ -657,7 +899,13 @@ post_tool_to_api() {
 
   if [[ "$status" == "failed" ]]; then
     [[ ! "$exit_code" =~ ^[0-9]+$ ]] && exit_code=1
-    error=$(explain_exit_code "$exit_code")
+    local error_text=""
+    error_text=$(get_error_text)
+    if [[ -n "$error_text" ]]; then
+      error=$(json_escape "$error_text")
+    else
+      error=$(json_escape "$(explain_exit_code "$exit_code")")
+    fi
     error_category=$(categorize_error "$exit_code")
   fi
 
@@ -718,7 +966,13 @@ post_addon_to_api() {
 
   if [[ "$status" == "failed" ]]; then
     [[ ! "$exit_code" =~ ^[0-9]+$ ]] && exit_code=1
-    error=$(explain_exit_code "$exit_code")
+    local error_text=""
+    error_text=$(get_error_text)
+    if [[ -n "$error_text" ]]; then
+      error=$(json_escape "$error_text")
+    else
+      error=$(json_escape "$(explain_exit_code "$exit_code")")
+    fi
     error_category=$(categorize_error "$exit_code")
   fi
 
@@ -811,7 +1065,13 @@ post_update_to_api_extended() {
     else
       exit_code=1
     fi
-    error=$(explain_exit_code "$exit_code")
+    local error_text=""
+    error_text=$(get_error_text)
+    if [[ -n "$error_text" ]]; then
+      error=$(json_escape "$error_text")
+    else
+      error=$(json_escape "$(explain_exit_code "$exit_code")")
+    fi
     error_category=$(categorize_error "$exit_code")
     [[ -z "$error" ]] && error="Unknown error"
   fi
diff --git a/misc/data/.gitignore b/misc/data/.gitignore
new file mode 100644
index 000000000..03cf14d6e
--- /dev/null
+++ b/misc/data/.gitignore
@@ -0,0 +1,34 @@
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+telemetry-service
+migration/migrate
+
+# Test binary, built with `go test -c`
+*.test
+
+# Code coverage profiles and other test artifacts
+*.out
+coverage.*
+*.coverprofile
+profile.cov
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
+go.work
+go.work.sum
+
+# env file
+.env
+
+# Editor/IDE
+# .idea/
+# .vscode/
diff --git a/misc/data/Dockerfile b/misc/data/Dockerfile
index 3d58795c0..7201849b2 100644
--- a/misc/data/Dockerfile
+++ b/misc/data/Dockerfile
@@ -24,7 +24,7 @@ ENV ENABLE_REQUEST_LOGGING="false"
 
 # Cache config (optional)
 ENV ENABLE_CACHE="true"
-ENV CACHE_TTL_SECONDS="60"
+ENV CACHE_TTL_SECONDS="300"
 ENV ENABLE_REDIS="false"
 # ENV REDIS_URL="redis://localhost:6379"
 
diff --git a/misc/data/LICENSE b/misc/data/LICENSE
new file mode 100644
index 000000000..1fae4b9c8
--- /dev/null
+++ b/misc/data/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Community Scripts
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/misc/data/README.md b/misc/data/README.md
new file mode 100644
index 000000000..0211ab9f1
--- /dev/null
+++ b/misc/data/README.md
@@ -0,0 +1,81 @@
+# Telemetry Service
+
+A standalone Go microservice that collects anonymous telemetry data from [ProxmoxVE](https://github.com/community-scripts/ProxmoxVE) and [ProxmoxVED](https://github.com/community-scripts/ProxmoxVED) script installations.
+
+## Overview
+
+This service acts as a telemetry ingestion layer between the bash installation scripts and a PocketBase backend. When users run scripts from the ProxmoxVE/ProxmoxVED repositories, optional anonymous usage data is sent here for aggregation and analysis.
+
+**What gets collected:**
+- Script name and installation status (success/failed)
+- Container/VM type and resource allocation (CPU, RAM, disk)
+- OS type and version
+- Proxmox VE version
+- Anonymous session ID (randomly generated UUID)
+
+**What is NOT collected:**
+- IP addresses (not logged, not stored)
+- Hostnames or domain names
+- User credentials or personal information
+- Hardware identifiers (MAC addresses, serial numbers)
+- Network configuration or internal IPs
+- Any data that could identify a person or system
+
+**What this enables:**
+- Understanding which scripts are most popular
+- Identifying scripts with high failure rates
+- Tracking resource allocation trends
+- Improving script quality based on real-world data
+
+## Features
+
+- **Telemetry Ingestion** - Receives and validates telemetry data from bash scripts
+- **PocketBase Integration** - Stores data in PocketBase collections
+- **Rate Limiting** - Configurable per-IP rate limiting to prevent abuse
+- **Caching** - In-memory or Redis-backed caching support
+- **Email Alerts** - SMTP-based alerts when failure rates exceed thresholds
+- **Dashboard** - Built-in HTML dashboard for telemetry visualization
+- **Migration Tool** - Migrate data from external sources to PocketBase
+
+## Architecture
+
+```
+┌─────────────────┐     ┌───────────────────┐     ┌────────────┐
+│  Bash Scripts   │────▶│ Telemetry Service │────▶│ PocketBase │
+│ (ProxmoxVE/VED) │     │    (this repo)    │     │  Database  │
+└─────────────────┘     └───────────────────┘     └────────────┘
+```
+
+## Project Structure
+
+```
+├── service.go          # Main service, HTTP handlers, rate limiting
+├── cache.go            # In-memory and Redis caching
+├── alerts.go           # SMTP alert system
+├── dashboard.go        # Dashboard HTML generation
+├── migration/
+│   ├── migrate.go      # Data migration tool
+│   └── migrate.sh      # Migration shell script
+├── Dockerfile          # Container build
+├── entrypoint.sh       # Container entrypoint with migration support
+└── go.mod              # Go module definition
+```
+
+## Related Projects
+
+- [ProxmoxVE](https://github.com/community-scripts/ProxmoxVE) - Proxmox VE Helper Scripts
+- [ProxmoxVED](https://github.com/community-scripts/ProxmoxVED) - Proxmox VE Helper Scripts (Dev)
+
+## Privacy & Compliance
+
+This service is designed with privacy in mind and is **GDPR/DSGVO compliant**:
+
+- ✅ **No personal data** - Only anonymous technical metrics are collected
+- ✅ **No IP logging** - Request logging is disabled by default, IPs are never stored
+- ✅ **Transparent** - All collected fields are documented and the code is open source
+- ✅ **No tracking** - Session IDs are randomly generated and cannot be linked to users
+- ✅ **No third parties** - Data is only stored in our self-hosted PocketBase instance
+
+## License
+
+MIT License - see [LICENSE](LICENSE) file.
diff --git a/misc/data/alerts.go b/misc/data/alerts.go
index 01f1a57f1..9890cbb75 100644
--- a/misc/data/alerts.go
+++ b/misc/data/alerts.go
@@ -134,7 +134,7 @@ func (a *Alerter) checkAndAlert() {
 	defer cancel()
 
 	// Fetch last hour's data
-	data, err := a.pb.FetchDashboardData(ctx, 1)
+	data, err := a.pb.FetchDashboardData(ctx, 1, "ProxmoxVE")
 	if err != nil {
 		log.Printf("WARN: alert check failed: %v", err)
 		return
@@ -410,13 +410,13 @@ func (a *Alerter) fetchWeeklyReportData(ctx context.Context) (*WeeklyReportData,
 	year, week := lastMonday.ISOWeek()
 
 	// Fetch current week's data (7 days)
-	currentData, err := a.pb.FetchDashboardData(ctx, 7)
+	currentData, err := a.pb.FetchDashboardData(ctx, 7, "ProxmoxVE")
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch current week data: %w", err)
 	}
 
 	// Fetch previous week's data for comparison (14 days, we'll compare)
-	prevData, err := a.pb.FetchDashboardData(ctx, 14)
+	prevData, err := a.pb.FetchDashboardData(ctx, 14, "ProxmoxVE")
 	if err != nil {
 		// Non-fatal, just log
 		log.Printf("WARN: could not fetch previous week data: %v", err)
diff --git a/misc/data/cleanup.go b/misc/data/cleanup.go
index c072bef3d..5b0e672f8 100644
--- a/misc/data/cleanup.go
+++ b/misc/data/cleanup.go
@@ -108,7 +108,7 @@ func (c *Cleaner) findStuckInstallations(ctx context.Context) ([]StuckRecord, er
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet,
 		fmt.Sprintf("%s/api/collections/%s/records?filter=%s&perPage=100",
-			c.pb.baseURL, c.pb.devColl, filter),
+			c.pb.baseURL, c.pb.targetColl, filter),
 		nil,
 	)
 	if err != nil {
diff --git a/misc/data/dashboard.go b/misc/data/dashboard.go
index ab899be94..fbfff5ff8 100644
--- a/misc/data/dashboard.go
+++ b/misc/data/dashboard.go
@@ -13,6 +13,8 @@ import (
 // DashboardData holds aggregated statistics for the dashboard
 type DashboardData struct {
 	TotalInstalls   int               `json:"total_installs"`
+	TotalAllTime    int               `json:"total_all_time"`    // Total records in DB (not limited)
+	SampleSize      int               `json:"sample_size"`       // How many records were sampled
 	SuccessCount    int               `json:"success_count"`
 	FailedCount     int               `json:"failed_count"`
 	InstallingCount int               `json:"installing_count"`
@@ -104,27 +106,43 @@ type AddonCount struct {
 }
 
 // FetchDashboardData retrieves aggregated data from PocketBase
-func (p *PBClient) FetchDashboardData(ctx context.Context, days int) (*DashboardData, error) {
+// repoSource filters by repo_source field ("ProxmoxVE", "ProxmoxVED", "external", or "" for all)
+func (p *PBClient) FetchDashboardData(ctx context.Context, days int, repoSource string) (*DashboardData, error) {
 	if err := p.ensureAuth(ctx); err != nil {
 		return nil, err
 	}
 
 	data := &DashboardData{}
 
-	// Calculate date filter (days=0 means all entries)
-	var filter string
+	// Build filter parts
+	var filterParts []string
+
+	// Date filter (days=0 means all entries)
 	if days > 0 {
 		since := time.Now().AddDate(0, 0, -days).Format("2006-01-02 00:00:00")
-		filter = url.QueryEscape(fmt.Sprintf("created >= '%s'", since))
-	} else {
-		filter = "" // No filter = all entries
+		filterParts = append(filterParts, fmt.Sprintf("created >= '%s'", since))
+	}
+
+	// Repo source filter
+	if repoSource != "" {
+		filterParts = append(filterParts, fmt.Sprintf("repo_source = '%s'", repoSource))
+	}
+
+	var filter string
+	if len(filterParts) > 0 {
+		filter = url.QueryEscape(strings.Join(filterParts, " && "))
 	}
 
 	// Fetch all records for the period
-	records, err := p.fetchRecords(ctx, filter)
+	result, err := p.fetchRecords(ctx, filter)
 	if err != nil {
 		return nil, err
 	}
+	records := result.Records
+	
+	// Set total counts
+	data.TotalAllTime = result.TotalItems    // Actual total in database
+	data.SampleSize = len(records)           // How many we actually processed
 
 	// Aggregate statistics
 	appCounts := make(map[string]int)
@@ -246,18 +264,18 @@ func (p *PBClient) FetchDashboardData(ctx context.Context, days int) (*Dashboard
 		data.SuccessRate = float64(data.SuccessCount) / float64(completed) * 100
 	}
 
-	// Convert maps to sorted slices (top 10)
-	data.TopApps = topN(appCounts, 10)
-	data.OsDistribution = topNOs(osCounts, 10)
+	// Convert maps to sorted slices (increased limits for better analytics)
+	data.TopApps = topN(appCounts, 20)
+	data.OsDistribution = topNOs(osCounts, 15)
 	data.MethodStats = topNMethod(methodCounts, 10)
-	data.PveVersions = topNPve(pveCounts, 10)
+	data.PveVersions = topNPve(pveCounts, 15)
 	data.TypeStats = topNType(typeCounts, 10)
 
 	// Error analysis
-	data.ErrorAnalysis = buildErrorAnalysis(errorPatterns, 10)
+	data.ErrorAnalysis = buildErrorAnalysis(errorPatterns, 15)
 
-	// Failed apps with failure rates
-	data.FailedApps = buildFailedApps(appCounts, appFailures, 10)
+	// Failed apps with failure rates (min 10 installs threshold)
+	data.FailedApps = buildFailedApps(appCounts, appFailures, 15)
 
 	// Daily stats for chart
 	data.DailyStats = buildDailyStats(dailySuccess, dailyFailed, days)
@@ -271,10 +289,10 @@ func (p *PBClient) FetchDashboardData(ctx context.Context, days int) (*Dashboard
 	data.ErrorCategories = buildErrorCategories(errorCatCounts)
 
 	// Top tools
-	data.TopTools = buildToolStats(toolCounts, 10)
+	data.TopTools = buildToolStats(toolCounts, 15)
 
 	// Top addons
-	data.TopAddons = buildAddonStats(addonCounts, 10)
+	data.TopAddons = buildAddonStats(addonCounts, 15)
 
 	// Average install duration
 	if durationCount > 0 {
@@ -297,22 +315,30 @@ type TelemetryRecord struct {
 	Created string `json:"created"`
 }
 
-func (p *PBClient) fetchRecords(ctx context.Context, filter string) ([]TelemetryRecord, error) {
+// fetchRecordsResult contains records and total count
+type fetchRecordsResult struct {
+	Records    []TelemetryRecord
+	TotalItems int // Actual total in database (not limited)
+}
+
+func (p *PBClient) fetchRecords(ctx context.Context, filter string) (*fetchRecordsResult, error) {
 	var allRecords []TelemetryRecord
 	page := 1
 	perPage := 500
+	maxRecords := 100000 // Limit to prevent timeout with large datasets
+	totalItems := 0
 
 	for {
-		var url string
+		var reqURL string
 		if filter != "" {
-			url = fmt.Sprintf("%s/api/collections/%s/records?filter=%s&sort=-created&page=%d&perPage=%d",
-				p.baseURL, p.devColl, filter, page, perPage)
+			reqURL = fmt.Sprintf("%s/api/collections/%s/records?filter=%s&sort=-created&page=%d&perPage=%d",
+				p.baseURL, p.targetColl, filter, page, perPage)
 		} else {
-			url = fmt.Sprintf("%s/api/collections/%s/records?sort=-created&page=%d&perPage=%d",
-				p.baseURL, p.devColl, page, perPage)
+			reqURL = fmt.Sprintf("%s/api/collections/%s/records?sort=-created&page=%d&perPage=%d",
+				p.baseURL, p.targetColl, page, perPage)
 		}
 
-		req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+		req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil)
 		if err != nil {
 			return nil, err
 		}
@@ -333,15 +359,24 @@ func (p *PBClient) fetchRecords(ctx context.Context, filter string) ([]Telemetry
 		}
 		resp.Body.Close()
 
+		// Store total on first page
+		if page == 1 {
+			totalItems = result.TotalItems
+		}
+
 		allRecords = append(allRecords, result.Items...)
 
-		if len(allRecords) >= result.TotalItems {
+		// Stop if we have enough records or reached the end
+		if len(allRecords) >= maxRecords || len(allRecords) >= result.TotalItems {
 			break
 		}
 		page++
 	}
 
-	return allRecords, nil
+	return &fetchRecordsResult{
+		Records:    allRecords,
+		TotalItems: totalItems,
+	}, nil
 }
 
 func topN(m map[string]int, n int) []AppCount {
@@ -520,11 +555,12 @@ func buildErrorAnalysis(patterns map[string]map[string]bool, n int) []ErrorGroup
 
 func buildFailedApps(total, failed map[string]int, n int) []AppFailure {
 	result := make([]AppFailure, 0)
+	minInstalls := 10 // Minimum installations to be considered (avoid noise from rare apps)
 
 	for app, failCount := range failed {
 		totalCount := total[app]
-		if totalCount == 0 {
-			continue
+		if totalCount < minInstalls {
+			continue // Skip apps with too few installations
 		}
 
 		rate := float64(failCount) / float64(totalCount) * 100
@@ -662,37 +698,49 @@ func DashboardHTML() string {
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Telemetry Dashboard - ProxmoxVE Helper Scripts</title>
-    <meta name="description" content="Installation telemetry dashboard for ProxmoxVE Helper Scripts">
+    <title>Analytics - Proxmox VE Helper-Scripts</title>
+    <meta name="description" content="Installation analytics and telemetry for Proxmox VE Helper Scripts">
     <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>📊</text></svg>">
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     <style>
         :root {
-            --bg-primary: #0d1117;
-            --bg-secondary: #161b22;
-            --bg-tertiary: #21262d;
-            --border-color: #30363d;
-            --text-primary: #c9d1d9;
+            --bg-primary: #0a0e14;
+            --bg-secondary: #131920;
+            --bg-tertiary: #1a2029;
+            --bg-card: #151b23;
+            --border-color: #2d3748;
+            --text-primary: #e2e8f0;
             --text-secondary: #8b949e;
-            --accent-blue: #58a6ff;
-            --accent-green: #3fb950;
-            --accent-red: #f85149;
-            --accent-yellow: #d29922;
-            --accent-purple: #a371f7;
+            --text-muted: #64748b;
+            --accent-blue: #3b82f6;
+            --accent-cyan: #22d3ee;
+            --accent-green: #22c55e;
+            --accent-red: #ef4444;
+            --accent-yellow: #eab308;
+            --accent-orange: #f97316;
+            --accent-purple: #a855f7;
+            --accent-pink: #ec4899;
+            --accent-lime: #84cc16;
+            --gradient-blue: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);
+            --gradient-green: linear-gradient(135deg, #22c55e 0%, #16a34a 100%);
+            --gradient-red: linear-gradient(135deg, #ef4444 0%, #dc2626 100%);
+            --shadow-sm: 0 1px 2px 0 rgb(0 0 0 / 0.05);
+            --shadow-md: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
+            --shadow-lg: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
         }
         
         [data-theme="light"] {
-            --bg-primary: #ffffff;
-            --bg-secondary: #f6f8fa;
-            --bg-tertiary: #eaeef2;
-            --border-color: #d0d7de;
-            --text-primary: #1f2328;
-            --text-secondary: #656d76;
-            --accent-blue: #0969da;
-            --accent-green: #1a7f37;
-            --accent-red: #cf222e;
-            --accent-yellow: #9a6700;
-            --accent-purple: #8250df;
+            --bg-primary: #f8fafc;
+            --bg-secondary: #ffffff;
+            --bg-tertiary: #f1f5f9;
+            --bg-card: #ffffff;
+            --border-color: #e2e8f0;
+            --text-primary: #1e293b;
+            --text-secondary: #64748b;
+            --text-muted: #94a3b8;
         }
         
         * {
@@ -702,64 +750,330 @@ func DashboardHTML() string {
         }
         
         body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;
+            font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
             background: var(--bg-primary);
             color: var(--text-primary);
             min-height: 100vh;
-            padding: 20px;
+            line-height: 1.5;
         }
         
-        .header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 24px;
-            padding-bottom: 16px;
+        /* Top Navigation Bar */
+        .navbar {
+            background: var(--bg-secondary);
             border-bottom: 1px solid var(--border-color);
+            padding: 0 24px;
+            height: 64px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            position: sticky;
+            top: 0;
+            z-index: 100;
+            backdrop-filter: blur(10px);
         }
         
-        .header h1 {
-            font-size: 24px;
+        .navbar-brand {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+            text-decoration: none;
+            color: var(--text-primary);
             font-weight: 600;
+            font-size: 16px;
+        }
+        
+        .navbar-brand svg {
+            color: var(--accent-cyan);
+        }
+        
+        .navbar-center {
+            flex: 1;
             display: flex;
-            align-items: center;
-            gap: 12px;
+            justify-content: center;
+            padding: 0 40px;
         }
         
-        .header h1 img {
-            height: 40px;
+        .search-box {
+            position: relative;
+            width: 100%;
+            max-width: 320px;
         }
         
-        .controls {
-            display: flex;
-            gap: 12px;
-            align-items: center;
-        }
-        
-        select, button {
+        .search-box input {
+            width: 100%;
             background: var(--bg-tertiary);
             border: 1px solid var(--border-color);
             color: var(--text-primary);
-            padding: 8px 16px;
-            border-radius: 6px;
+            padding: 10px 16px 10px 40px;
+            border-radius: 8px;
             font-size: 14px;
-            cursor: pointer;
+            outline: none;
+            transition: border-color 0.2s, box-shadow 0.2s;
         }
         
-        select:hover, button:hover {
+        .search-box input::placeholder {
+            color: var(--text-muted);
+        }
+        
+        .search-box input:focus {
+            border-color: var(--accent-blue);
+            box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+        }
+        
+        .search-box svg {
+            position: absolute;
+            left: 12px;
+            top: 50%;
+            transform: translateY(-50%);
+            color: var(--text-muted);
+        }
+        
+        .search-box .shortcut {
+            position: absolute;
+            right: 12px;
+            top: 50%;
+            transform: translateY(-50%);
+            background: var(--bg-primary);
+            border: 1px solid var(--border-color);
+            padding: 2px 8px;
+            border-radius: 4px;
+            font-size: 11px;
+            color: var(--text-muted);
+        }
+        
+        .navbar-actions {
+            display: flex;
+            align-items: center;
+            gap: 12px;
+        }
+        
+        .github-stars {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            background: var(--accent-yellow);
+            color: #000;
+            padding: 6px 14px;
+            border-radius: 20px;
+            font-size: 13px;
+            font-weight: 600;
+            text-decoration: none;
+            transition: transform 0.2s;
+        }
+        
+        .github-stars:hover {
+            transform: scale(1.05);
+        }
+        
+        .nav-icon {
+            width: 40px;
+            height: 40px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 8px;
+            color: var(--text-secondary);
+            transition: background 0.2s, color 0.2s;
+            cursor: pointer;
+            border: none;
+            background: transparent;
+        }
+        
+        .nav-icon:hover {
+            background: var(--bg-tertiary);
+            color: var(--text-primary);
+        }
+        
+        /* Main Content */
+        .main-content {
+            padding: 32px;
+            max-width: 1600px;
+            margin: 0 auto;
+        }
+        
+        /* Page Header */
+        .page-header {
+            margin-bottom: 32px;
+        }
+        
+        .page-header h1 {
+            font-size: 28px;
+            font-weight: 700;
+            margin-bottom: 8px;
+        }
+        
+        .page-header p {
+            color: var(--text-secondary);
+            font-size: 15px;
+        }
+        
+        /* Stat Cards Grid */
+        .stats-grid {
+            display: grid;
+            grid-template-columns: repeat(4, 1fr);
+            gap: 20px;
+            margin-bottom: 32px;
+        }
+        
+        @media (max-width: 1200px) {
+            .stats-grid {
+                grid-template-columns: repeat(2, 1fr);
+            }
+        }
+        
+        @media (max-width: 640px) {
+            .stats-grid {
+                grid-template-columns: 1fr;
+            }
+        }
+        
+        .stat-card {
+            background: var(--bg-card);
+            border: 1px solid var(--border-color);
+            border-radius: 12px;
+            padding: 24px;
+            position: relative;
+            overflow: hidden;
+        }
+        
+        .stat-card-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-start;
+            margin-bottom: 16px;
+        }
+        
+        .stat-card-label {
+            font-size: 14px;
+            color: var(--text-secondary);
+            font-weight: 500;
+        }
+        
+        .stat-card-icon {
+            width: 36px;
+            height: 36px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 8px;
+            color: var(--text-secondary);
+        }
+        
+        .stat-card-value {
+            font-size: 36px;
+            font-weight: 700;
+            line-height: 1;
+            margin-bottom: 6px;
+        }
+        
+        .stat-card-subtitle {
+            font-size: 13px;
+            color: var(--text-muted);
+        }
+        
+        .stat-card.success .stat-card-icon { color: var(--accent-green); }
+        .stat-card.success .stat-card-value { color: var(--accent-green); }
+        .stat-card.failed .stat-card-icon { color: var(--accent-red); }
+        .stat-card.failed .stat-card-value { color: var(--accent-red); }
+        .stat-card.popular .stat-card-icon { color: var(--accent-yellow); }
+        .stat-card.popular .stat-card-value { font-size: 24px; }
+        
+        /* Section Cards */
+        .section-card {
+            background: var(--bg-card);
+            border: 1px solid var(--border-color);
+            border-radius: 12px;
+            margin-bottom: 24px;
+            overflow: hidden;
+        }
+        
+        .section-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20px 24px;
+            border-bottom: 1px solid var(--border-color);
+        }
+        
+        .section-header h2 {
+            font-size: 18px;
+            font-weight: 600;
+        }
+        
+        .section-header p {
+            font-size: 13px;
+            color: var(--text-secondary);
+            margin-top: 2px;
+        }
+        
+        .section-actions {
+            display: flex;
+            gap: 8px;
+        }
+        
+        .btn {
+            display: inline-flex;
+            align-items: center;
+            gap: 6px;
+            padding: 8px 16px;
+            border-radius: 8px;
+            font-size: 13px;
+            font-weight: 500;
+            cursor: pointer;
+            transition: all 0.2s;
+            border: 1px solid var(--border-color);
+            background: var(--bg-tertiary);
+            color: var(--text-primary);
+        }
+        
+        .btn:hover {
+            background: var(--bg-primary);
             border-color: var(--accent-blue);
         }
         
-        button {
+        .btn-primary {
             background: var(--accent-blue);
             border-color: var(--accent-blue);
             color: #fff;
         }
         
+        .btn-primary:hover {
+            background: #2563eb;
+        }
+        
+        /* Top Applications Chart */
+        .chart-container {
+            padding: 24px;
+            height: 420px;
+        }
+        
+        /* Filters Section */
+        .filters-bar {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+            padding: 16px 24px;
+            background: var(--bg-tertiary);
+            border-bottom: 1px solid var(--border-color);
+            flex-wrap: wrap;
+        }
+        
+        .filter-group {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+        
+        .filter-group label {
+            font-size: 13px;
+            color: var(--text-secondary);
+            white-space: nowrap;
+        }
+        
         .quickfilter {
             display: flex;
             gap: 4px;
-            background: var(--bg-tertiary);
+            background: var(--bg-secondary);
             padding: 4px;
             border-radius: 8px;
             border: 1px solid var(--border-color);
@@ -769,15 +1083,16 @@ func DashboardHTML() string {
             background: transparent;
             border: none;
             color: var(--text-secondary);
-            padding: 6px 12px;
+            padding: 6px 14px;
             border-radius: 6px;
             font-size: 13px;
             font-weight: 500;
+            cursor: pointer;
             transition: all 0.2s;
         }
         
         .filter-btn:hover {
-            background: var(--bg-secondary);
+            background: var(--bg-tertiary);
             color: var(--text-primary);
         }
         
@@ -786,55 +1101,496 @@ func DashboardHTML() string {
             color: #fff;
         }
         
-        .stats-grid {
-            display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
-            gap: 16px;
-            margin-bottom: 24px;
-        }
-        
-        .stat-card {
+        /* Custom Select */
+        .custom-select {
             background: var(--bg-secondary);
             border: 1px solid var(--border-color);
+            color: var(--text-primary);
+            padding: 8px 32px 8px 12px;
             border-radius: 8px;
-            padding: 20px;
+            font-size: 13px;
+            cursor: pointer;
+            outline: none;
+            appearance: none;
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 24 24' fill='none' stroke='%238b949e' stroke-width='2'%3E%3Cpath d='M6 9l6 6 6-6'/%3E%3C/svg%3E");
+            background-repeat: no-repeat;
+            background-position: right 10px center;
         }
         
-        .stat-card .label {
+        .custom-select:focus {
+            border-color: var(--accent-blue);
+        }
+        
+        .search-input {
+            background: var(--bg-secondary);
+            border: 1px solid var(--border-color);
+            color: var(--text-primary);
+            padding: 8px 12px;
+            border-radius: 8px;
+            font-size: 13px;
+            outline: none;
+            min-width: 200px;
+        }
+        
+        .search-input:focus {
+            border-color: var(--accent-blue);
+        }
+        
+        .search-input::placeholder {
+            color: var(--text-muted);
+        }
+        
+        /* Table Styles */
+        .table-wrapper {
+            overflow-x: auto;
+        }
+        
+        table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+        
+        th, td {
+            padding: 14px 20px;
+            text-align: left;
+        }
+        
+        th {
             font-size: 12px;
+            font-weight: 600;
             color: var(--text-secondary);
             text-transform: uppercase;
             letter-spacing: 0.5px;
-            margin-bottom: 8px;
+            background: var(--bg-tertiary);
+            border-bottom: 1px solid var(--border-color);
+            white-space: nowrap;
         }
         
-        .stat-card .value {
-            font-size: 32px;
+        th.sortable {
+            cursor: pointer;
+            user-select: none;
+            transition: color 0.2s;
+        }
+        
+        th.sortable:hover {
+            color: var(--accent-blue);
+        }
+        
+        th.sort-asc, th.sort-desc {
+            color: var(--accent-blue);
+        }
+        
+        td {
+            font-size: 14px;
+            border-bottom: 1px solid var(--border-color);
+        }
+        
+        tr:hover td {
+            background: rgba(59, 130, 246, 0.05);
+        }
+        
+        tr.clickable-row {
+            cursor: pointer;
+        }
+        
+        /* Status Badge */
+        .status-badge {
+            display: inline-flex;
+            align-items: center;
+            padding: 4px 10px;
+            border-radius: 6px;
+            font-size: 12px;
             font-weight: 600;
+            text-transform: capitalize;
+            border: 1px solid transparent;
         }
         
-        .stat-card .value.success { color: var(--accent-green); }
-        .stat-card .value.failed { color: var(--accent-red); }
-        .stat-card .value.pending { color: var(--accent-yellow); }
-        .stat-card .value.rate { color: var(--accent-blue); }
+        .status-badge.success {
+            background: rgba(34, 197, 94, 0.15);
+            color: var(--accent-green);
+            border-color: rgba(34, 197, 94, 0.3);
+        }
         
+        .status-badge.failed {
+            background: rgba(239, 68, 68, 0.15);
+            color: var(--accent-red);
+            border-color: rgba(239, 68, 68, 0.3);
+        }
+        
+        .status-badge.installing {
+            background: rgba(234, 179, 8, 0.15);
+            color: var(--accent-yellow);
+            border-color: rgba(234, 179, 8, 0.3);
+        }
+        
+        .status-badge.unknown {
+            background: rgba(100, 116, 139, 0.15);
+            color: var(--text-muted);
+            border-color: rgba(100, 116, 139, 0.3);
+        }
+        
+        /* Type Badge */
+        .type-badge {
+            display: inline-flex;
+            align-items: center;
+            padding: 4px 10px;
+            border-radius: 6px;
+            font-size: 11px;
+            font-weight: 700;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+        }
+        
+        .type-badge.lxc {
+            background: rgba(34, 211, 238, 0.15);
+            color: var(--accent-cyan);
+            border: 1px solid rgba(34, 211, 238, 0.3);
+        }
+        
+        .type-badge.vm {
+            background: rgba(168, 85, 247, 0.15);
+            color: var(--accent-purple);
+            border: 1px solid rgba(168, 85, 247, 0.3);
+        }
+        
+        .type-badge.tool {
+            background: rgba(249, 115, 22, 0.15);
+            color: var(--accent-orange);
+            border: 1px solid rgba(249, 115, 22, 0.3);
+        }
+        
+        .type-badge.addon {
+            background: rgba(236, 72, 153, 0.15);
+            color: var(--accent-pink);
+            border: 1px solid rgba(236, 72, 153, 0.3);
+        }
+        
+        /* Pagination */
+        .table-footer {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 16px 24px;
+            background: var(--bg-tertiary);
+            border-top: 1px solid var(--border-color);
+        }
+        
+        .pagination {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+        
+        .pagination button {
+            padding: 8px 14px;
+            border-radius: 6px;
+            font-size: 13px;
+            border: 1px solid var(--border-color);
+            background: var(--bg-secondary);
+            color: var(--text-primary);
+            cursor: pointer;
+            transition: all 0.2s;
+        }
+        
+        .pagination button:hover:not(:disabled) {
+            border-color: var(--accent-blue);
+            background: var(--bg-primary);
+        }
+        
+        .pagination button:disabled {
+            opacity: 0.5;
+            cursor: not-allowed;
+        }
+        
+        .pagination-info {
+            font-size: 13px;
+            color: var(--text-secondary);
+        }
+        
+        .per-page-select {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+        
+        .per-page-select label {
+            font-size: 13px;
+            color: var(--text-secondary);
+        }
+        
+        /* Loading & Error States */
+        .loading {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            padding: 60px 20px;
+            color: var(--text-secondary);
+        }
+        
+        .loading-spinner {
+            width: 40px;
+            height: 40px;
+            border: 3px solid var(--border-color);
+            border-top-color: var(--accent-blue);
+            border-radius: 50%;
+            animation: spin 1s linear infinite;
+            margin-bottom: 16px;
+        }
+        
+        @keyframes spin {
+            to { transform: rotate(360deg); }
+        }
+        
+        .error-banner {
+            background: rgba(239, 68, 68, 0.1);
+            border: 1px solid rgba(239, 68, 68, 0.3);
+            color: var(--accent-red);
+            padding: 16px 24px;
+            border-radius: 8px;
+            margin-bottom: 24px;
+            display: flex;
+            align-items: center;
+            gap: 12px;
+        }
+        
+        /* Modal Styles */
+        .modal-overlay {
+            position: fixed;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+            background: rgba(0, 0, 0, 0.75);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            z-index: 1000;
+            opacity: 0;
+            visibility: hidden;
+            transition: opacity 0.2s, visibility 0.2s;
+            backdrop-filter: blur(4px);
+        }
+        
+        .modal-overlay.active {
+            opacity: 1;
+            visibility: visible;
+        }
+        
+        .modal-content {
+            background: var(--bg-card);
+            border: 1px solid var(--border-color);
+            border-radius: 16px;
+            width: 90%;
+            max-width: 700px;
+            max-height: 90vh;
+            overflow-y: auto;
+            transform: scale(0.95) translateY(10px);
+            transition: transform 0.2s;
+            box-shadow: var(--shadow-lg);
+        }
+        
+        .modal-overlay.active .modal-content {
+            transform: scale(1) translateY(0);
+        }
+        
+        .modal-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 20px 24px;
+            border-bottom: 1px solid var(--border-color);
+            position: sticky;
+            top: 0;
+            background: var(--bg-card);
+            z-index: 10;
+        }
+        
+        .modal-header h2 {
+            font-size: 18px;
+            font-weight: 600;
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+        
+        .modal-close {
+            width: 36px;
+            height: 36px;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            border-radius: 8px;
+            background: transparent;
+            border: none;
+            color: var(--text-secondary);
+            font-size: 20px;
+            cursor: pointer;
+            transition: background 0.2s;
+        }
+        
+        .modal-close:hover {
+            background: var(--bg-tertiary);
+            color: var(--text-primary);
+        }
+        
+        .modal-body {
+            padding: 24px;
+        }
+        
+        /* Detail Modal Sections */
+        .detail-section {
+            margin-bottom: 24px;
+        }
+        
+        .detail-section:last-child {
+            margin-bottom: 0;
+        }
+        
+        .detail-section-header {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+            font-size: 12px;
+            font-weight: 600;
+            color: var(--text-secondary);
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            margin-bottom: 12px;
+            padding-bottom: 8px;
+            border-bottom: 1px solid var(--border-color);
+        }
+        
+        .detail-grid {
+            display: grid;
+            grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+            gap: 12px;
+        }
+        
+        .detail-item {
+            background: var(--bg-tertiary);
+            border-radius: 8px;
+            padding: 12px 16px;
+        }
+        
+        .detail-item .label {
+            font-size: 11px;
+            color: var(--text-muted);
+            text-transform: uppercase;
+            letter-spacing: 0.3px;
+            margin-bottom: 4px;
+        }
+        
+        .detail-item .value {
+            font-size: 14px;
+            font-weight: 500;
+            word-break: break-word;
+        }
+        
+        .detail-item .value.mono {
+            font-family: 'SF Mono', 'Consolas', monospace;
+            font-size: 12px;
+        }
+        
+        .detail-item .value.status-success { color: var(--accent-green); }
+        .detail-item .value.status-failed { color: var(--accent-red); }
+        .detail-item .value.status-installing { color: var(--accent-yellow); }
+        
+        .error-box {
+            background: rgba(239, 68, 68, 0.1);
+            border: 1px solid rgba(239, 68, 68, 0.3);
+            border-radius: 8px;
+            padding: 16px;
+            font-family: 'SF Mono', 'Consolas', monospace;
+            font-size: 12px;
+            color: var(--accent-red);
+            white-space: pre-wrap;
+            word-break: break-word;
+            max-height: 200px;
+            overflow-y: auto;
+        }
+        
+        /* Health Modal */
+        .health-modal {
+            max-width: 420px;
+        }
+        
+        .health-status {
+            display: flex;
+            align-items: center;
+            gap: 16px;
+            padding: 20px;
+            border-radius: 12px;
+            margin-bottom: 16px;
+        }
+        
+        .health-status.ok {
+            background: rgba(34, 197, 94, 0.1);
+            border: 1px solid rgba(34, 197, 94, 0.3);
+        }
+        
+        .health-status.error {
+            background: rgba(239, 68, 68, 0.1);
+            border: 1px solid rgba(239, 68, 68, 0.3);
+        }
+        
+        .health-status .icon {
+            font-size: 36px;
+        }
+        
+        .health-status .details .title {
+            font-weight: 600;
+            font-size: 16px;
+        }
+        
+        .health-status .details .subtitle {
+            font-size: 13px;
+            color: var(--text-secondary);
+            margin-top: 4px;
+        }
+        
+        .health-info {
+            background: var(--bg-tertiary);
+            border-radius: 8px;
+            padding: 16px;
+        }
+        
+        .health-info div {
+            display: flex;
+            justify-content: space-between;
+            padding: 8px 0;
+            font-size: 13px;
+            border-bottom: 1px solid var(--border-color);
+        }
+        
+        .health-info div:last-child {
+            border-bottom: none;
+        }
+        
+        /* Secondary Charts Section */
         .charts-grid {
             display: grid;
-            grid-template-columns: 2fr 1fr;
-            gap: 16px;
+            grid-template-columns: repeat(3, 1fr);
+            gap: 20px;
             margin-bottom: 24px;
         }
         
         @media (max-width: 1200px) {
+            .charts-grid {
+                grid-template-columns: repeat(2, 1fr);
+            }
+        }
+        
+        @media (max-width: 768px) {
             .charts-grid {
                 grid-template-columns: 1fr;
             }
         }
         
         .chart-card {
-            background: var(--bg-secondary);
+            background: var(--bg-card);
             border: 1px solid var(--border-color);
-            border-radius: 8px;
+            border-radius: 12px;
             padding: 20px;
         }
         
@@ -845,348 +1601,8 @@ func DashboardHTML() string {
             color: var(--text-secondary);
         }
         
-        .chart-container {
-            position: relative;
-            height: 300px;
-        }
-        
-        .small-charts {
-            display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-            gap: 16px;
-            margin-bottom: 24px;
-        }
-        
-        .table-card {
-            background: var(--bg-secondary);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            overflow: hidden;
-        }
-        
-        .table-card h3 {
-            font-size: 14px;
-            font-weight: 600;
-            padding: 16px 20px;
-            border-bottom: 1px solid var(--border-color);
-            color: var(--text-secondary);
-        }
-        
-        .filters {
-            padding: 12px 20px;
-            background: var(--bg-tertiary);
-            border-bottom: 1px solid var(--border-color);
-            display: flex;
-            gap: 12px;
-            flex-wrap: wrap;
-        }
-        
-        .filters input, .filters select {
-            background: var(--bg-secondary);
-            flex: 1;
-            min-width: 150px;
-        }
-        
-        table {
-            width: 100%;
-            border-collapse: collapse;
-        }
-        
-        th, td {
-            padding: 12px 20px;
-            text-align: left;
-            border-bottom: 1px solid var(--border-color);
-        }
-        
-        th {
-            font-size: 12px;
-            font-weight: 600;
-            color: var(--text-secondary);
-            text-transform: uppercase;
-            background: var(--bg-tertiary);
-        }
-        
-        td {
-            font-size: 14px;
-        }
-        
-        tr:hover {
-            background: var(--bg-tertiary);
-        }
-        
-        .status-badge {
-            display: inline-block;
-            padding: 4px 8px;
-            border-radius: 4px;
-            font-size: 12px;
-            font-weight: 500;
-        }
-        
-        .status-badge.success { background: rgba(63, 185, 80, 0.2); color: var(--accent-green); }
-        .status-badge.failed { background: rgba(248, 81, 73, 0.2); color: var(--accent-red); }
-        .status-badge.installing { background: rgba(210, 153, 34, 0.2); color: var(--accent-yellow); }
-        
-        th.sortable {
-            cursor: pointer;
-            user-select: none;
-            transition: background-color 0.2s;
-        }
-        th.sortable:hover {
-            background: rgba(88, 166, 255, 0.1);
-        }
-        th.sort-asc, th.sort-desc {
-            background: rgba(88, 166, 255, 0.15);
-            color: var(--accent-blue);
-        }
-        
-        .loading {
-            display: flex;
-            justify-content: center;
-            align-items: center;
+        .chart-card .chart-wrapper {
             height: 200px;
-            color: var(--text-secondary);
-        }
-        
-        .error {
-            background: rgba(248, 81, 73, 0.1);
-            border: 1px solid var(--accent-red);
-            color: var(--accent-red);
-            padding: 16px;
-            border-radius: 8px;
-            margin-bottom: 24px;
-        }
-        
-        .last-updated {
-            font-size: 12px;
-            color: var(--text-secondary);
-        }
-        
-        .footer {
-            margin-top: 24px;
-            padding-top: 16px;
-            border-top: 1px solid var(--border-color);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            color: var(--text-secondary);
-            font-size: 12px;
-        }
-        
-        .footer a {
-            color: var(--accent-blue);
-            text-decoration: none;
-        }
-        
-        .footer a:hover {
-            text-decoration: underline;
-        }
-        
-        .export-btn {
-            background: var(--bg-tertiary);
-            border-color: var(--border-color);
-            color: var(--text-primary);
-        }
-        
-        .export-btn:hover {
-            background: var(--bg-secondary);
-        }
-        
-        .admin-btn {
-            background: var(--bg-tertiary);
-            border: 1px solid var(--border-color);
-            color: var(--text-primary);
-            padding: 4px 8px;
-            border-radius: 4px;
-            font-size: 12px;
-            cursor: pointer;
-            margin-left: 8px;
-        }
-        
-        .admin-btn:hover {
-            background: var(--accent-blue);
-            color: #fff;
-            border-color: var(--accent-blue);
-        }
-        
-        .admin-btn:disabled {
-            opacity: 0.5;
-            cursor: not-allowed;
-        }
-        
-        .footer-btn {
-            background: transparent;
-            border: none;
-            color: var(--accent-blue);
-            cursor: pointer;
-            font-size: 12px;
-            padding: 0;
-            margin-right: 8px;
-        }
-        
-        .footer-btn:hover {
-            text-decoration: underline;
-        }
-        
-        .health-modal {
-            max-width: 400px;
-        }
-        
-        .health-status {
-            display: flex;
-            align-items: center;
-            gap: 12px;
-            padding: 16px;
-            border-radius: 8px;
-            margin-bottom: 12px;
-        }
-        
-        .health-status.ok {
-            background: rgba(63, 185, 80, 0.1);
-            border: 1px solid var(--accent-green);
-        }
-        
-        .health-status.error {
-            background: rgba(248, 81, 73, 0.1);
-            border: 1px solid var(--accent-red);
-        }
-        
-        .health-status .icon {
-            font-size: 32px;
-        }
-        
-        .health-status .details {
-            flex: 1;
-        }
-        
-        .health-status .title {
-            font-weight: 600;
-            font-size: 16px;
-        }
-        
-        .health-status .subtitle {
-            font-size: 12px;
-            color: var(--text-secondary);
-            margin-top: 4px;
-        }
-        
-        .health-info {
-            font-size: 12px;
-            color: var(--text-secondary);
-            padding: 12px;
-            background: var(--bg-tertiary);
-            border-radius: 6px;
-        }
-        
-        .health-info div {
-            display: flex;
-            justify-content: space-between;
-            padding: 4px 0;
-        }
-        
-        .pve-version-card {
-            background: var(--bg-secondary);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            padding: 16px;
-            margin-bottom: 24px;
-        }
-        
-        .pve-version-card h3 {
-            font-size: 14px;
-            font-weight: 600;
-            margin-bottom: 12px;
-            color: var(--text-secondary);
-        }
-        
-        .pve-versions {
-            display: flex;
-            flex-wrap: wrap;
-            gap: 8px;
-        }
-        
-        .pve-badge {
-            background: var(--bg-tertiary);
-            padding: 6px 12px;
-            border-radius: 16px;
-            font-size: 12px;
-            display: flex;
-            align-items: center;
-            gap: 6px;
-        }
-        
-        .pve-badge .count {
-            background: var(--accent-purple);
-            color: #fff;
-            padding: 2px 6px;
-            border-radius: 10px;
-            font-size: 10px;
-        }
-        
-        .theme-toggle {
-            background: var(--bg-tertiary);
-            border: 1px solid var(--border-color);
-            color: var(--text-primary);
-            padding: 8px 12px;
-            border-radius: 6px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-            gap: 6px;
-        }
-        
-        .theme-toggle:hover {
-            border-color: var(--accent-blue);
-        }
-        
-        .error-analysis-card {
-            background: var(--bg-secondary);
-            border: 1px solid var(--border-color);
-            border-radius: 8px;
-            padding: 16px;
-            margin-bottom: 24px;
-        }
-        
-        .error-analysis-card h3 {
-            font-size: 14px;
-            font-weight: 600;
-            margin-bottom: 12px;
-            color: var(--text-secondary);
-            display: flex;
-            align-items: center;
-            gap: 8px;
-        }
-        
-        .error-list {
-            display: flex;
-            flex-direction: column;
-            gap: 8px;
-        }
-        
-        .error-item {
-            background: var(--bg-tertiary);
-            border-radius: 6px;
-            padding: 12px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-        
-        .error-item .pattern {
-            font-family: monospace;
-            color: var(--accent-red);
-            font-size: 13px;
-        }
-        
-        .error-item .meta {
-            font-size: 12px;
-            color: var(--text-secondary);
-        }
-        
-        .error-item .count-badge {
-            background: var(--accent-red);
-            color: #fff;
-            padding: 4px 10px;
-            border-radius: 12px;
             font-size: 12px;
             font-weight: 600;
         }
@@ -1404,178 +1820,309 @@ func DashboardHTML() string {
     </style>
 </head>
 <body>
-    <div class="header">
-        <h1>
-            <svg width="32" height="32" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M3 3v18h18"/>
-                <path d="M18.7 8l-5.1 5.2-2.8-2.7L7 14.3"/>
+    <!-- Navigation Bar -->
+    <nav class="navbar">
+        <a href="https://community-scripts.github.io/ProxmoxVE/" class="navbar-brand" target="_blank">
+            <svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
+                <polyline points="4 17 10 11 4 5"/>
+                <line x1="12" y1="19" x2="20" y2="19"/>
             </svg>
-            Telemetry Dashboard
-        </h1>
-        <div class="controls">
-            <div class="quickfilter">
-                <button class="filter-btn" data-days="7">7 Days</button>
-                <button class="filter-btn active" data-days="30">30 Days</button>
-                <button class="filter-btn" data-days="90">90 Days</button>
-                <button class="filter-btn" data-days="365">1 Year</button>
-                <button class="filter-btn" data-days="0">All</button>
+            Proxmox VE Helper-Scripts
+        </a>
+        
+        <div class="navbar-center">
+            <div style="display: flex; align-items: center; gap: 12px;">
+                <span id="loadingIndicator" style="display: none; color: var(--accent-cyan); font-size: 14px;">
+                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" style="animation: spin 1s linear infinite; margin-right: 6px;">
+                        <circle cx="12" cy="12" r="10" stroke-opacity="0.3"/>
+                        <path d="M12 2a10 10 0 0 1 10 10"/>
+                    </svg>
+                    Loading data...
+                </span>
+                <span id="cacheStatus" style="font-size: 12px; color: var(--text-muted);"></span>
             </div>
-            <button class="export-btn" onclick="exportCSV()">Export CSV</button>
-            <button onclick="refreshData()">Refresh</button>
-            <button class="theme-toggle" onclick="toggleTheme()">
+        </div>
+        
+        <div class="navbar-actions">
+            <a href="https://github.com/community-scripts/ProxmoxVE" target="_blank" class="github-stars" id="githubStars">
+                <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                    <polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/>
+                </svg>
+                <span id="starCount">-</span>
+            </a>
+            <a href="https://github.com/community-scripts/ProxmoxVE" target="_blank" class="nav-icon" title="GitHub">
+                <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                    <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+                </svg>
+            </a>
+            <a href="https://discord.gg/2wvnMDgeFz" target="_blank" class="nav-icon" title="Discord">
+                <svg width="20" height="20" viewBox="0 0 24 24" fill="currentColor">
+                    <path d="M20.317 4.37a19.79 19.79 0 00-4.885-1.515.074.074 0 00-.079.037c-.21.375-.444.865-.608 1.25a18.27 18.27 0 00-5.487 0 12.64 12.64 0 00-.617-1.25.077.077 0 00-.079-.037A19.74 19.74 0 003.677 4.37a.07.07 0 00-.032.028C.533 9.046-.32 13.58.099 18.057a.082.082 0 00.031.057 19.9 19.9 0 005.993 3.03.078.078 0 00.084-.028c.462-.63.873-1.295 1.226-1.994a.076.076 0 00-.041-.106 13.11 13.11 0 01-1.872-.892.077.077 0 01-.008-.128c.126-.094.252-.192.372-.291a.074.074 0 01.078-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 01.078.009c.12.1.246.198.373.292a.077.077 0 01-.006.127 12.3 12.3 0 01-1.873.892.076.076 0 00-.041.107c.36.698.772 1.363 1.225 1.993a.076.076 0 00.084.029 19.84 19.84 0 006.002-3.03.077.077 0 00.032-.054c.5-5.177-.838-9.674-3.549-13.66a.06.06 0 00-.031-.03zM8.02 15.33c-1.183 0-2.157-1.086-2.157-2.419s.955-2.419 2.157-2.419c1.21 0 2.176 1.096 2.157 2.42 0 1.332-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.086-2.157-2.419s.955-2.419 2.157-2.419c1.21 0 2.176 1.096 2.157 2.42 0 1.332-.946 2.418-2.157 2.418z"/>
+                </svg>
+            </a>
+            <button class="theme-toggle" onclick="toggleTheme()" title="Toggle theme">
                 <span id="themeIcon">🌙</span>
             </button>
-            <span class="last-updated" id="lastUpdated"></span>
         </div>
-    </div>
+    </nav>
     
-    <div id="error" class="error" style="display: none;"></div>
-    
-    <div class="stats-grid">
-        <div class="stat-card">
-            <div class="label">Total Installations</div>
-            <div class="value" id="totalInstalls">-</div>
+    <!-- Main Content -->
+    <div class="main-content">
+        <!-- Page Header -->
+        <div class="page-header">
+            <h1>Analytics</h1>
+            <p>Overview of container installations and system statistics.</p>
         </div>
-        <div class="stat-card">
-            <div class="label">Successful</div>
-            <div class="value success" id="successCount">-</div>
-        </div>
-        <div class="stat-card">
-            <div class="label">Failed</div>
-            <div class="value failed" id="failedCount">-</div>
-        </div>
-        <div class="stat-card">
-            <div class="label">In Progress</div>
-            <div class="value pending" id="installingCount">-</div>
-        </div>
-        <div class="stat-card">
-            <div class="label">Success Rate</div>
-            <div class="value rate" id="successRate">-</div>
-        </div>
-        <div class="stat-card">
-            <div class="label">LXC / VM</div>
-            <div class="value" id="typeStats" style="font-size: 20px;">-</div>
-        </div>
-    </div>
-    
-    <div class="pve-version-card">
-        <h3>Proxmox VE Versions</h3>
-        <div class="pve-versions" id="pveVersions">
-            <span class="loading">Loading...</span>
-        </div>
-    </div>
-    
-    <div class="charts-grid">
-        <div class="chart-card">
-            <h3>Installations Over Time</h3>
-            <div class="chart-container">
-                <canvas id="dailyChart"></canvas>
+        
+        <!-- Filters Bar -->
+        <div class="filters-bar" style="background: var(--bg-card); border: 1px solid var(--border-color); border-radius: 12px; margin-bottom: 24px;">
+            <div class="filter-group">
+                <label>Source:</label>
+                <select id="repoFilter" class="custom-select" onchange="refreshData()">
+                    <option value="ProxmoxVE" selected>ProxmoxVE</option>
+                    <option value="ProxmoxVED">ProxmoxVED</option>
+                    <option value="Proxmox VE">Proxmox VE (Legacy)</option>
+                    <option value="external">External</option>
+                    <option value="all">All Sources</option>
+                </select>
+            </div>
+            <div class="filter-group">
+                <label>Period:</label>
+                <div class="quickfilter">
+                    <button class="filter-btn active" data-days="7">7 Days</button>
+                    <button class="filter-btn" data-days="30">30 Days</button>
+                    <button class="filter-btn" data-days="90">90 Days</button>
+                    <button class="filter-btn" data-days="365">1 Year</button>
+                    <button class="filter-btn" data-days="0">All</button>
+                </div>
+            </div>
+            <div style="margin-left: auto; display: flex; gap: 8px;">
+                <button class="btn" onclick="refreshData()">
+                    <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <path d="M23 4v6h-6"/><path d="M1 20v-6h6"/>
+                        <path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/>
+                    </svg>
+                    Refresh
+                </button>
+                <span class="last-updated" id="lastUpdated" style="align-self: center; font-size: 12px; color: var(--text-muted);"></span>
             </div>
         </div>
-        <div class="chart-card">
-            <h3>Status Distribution</h3>
-            <div class="chart-container">
-                <canvas id="statusChart"></canvas>
-            </div>
-        </div>
-    </div>
-    
-    <div class="small-charts">
-        <div class="chart-card">
-            <h3>Top Applications</h3>
-            <div class="chart-container">
-                <canvas id="appsChart"></canvas>
-            </div>
-        </div>
-        <div class="chart-card">
-            <h3>OS Distribution</h3>
-            <div class="chart-container">
-                <canvas id="osChart"></canvas>
-            </div>
-        </div>
-        <div class="chart-card">
-            <h3>Installation Method</h3>
-            <div class="chart-container">
-                <canvas id="methodChart"></canvas>
-            </div>
-        </div>
-    </div>
-    
-    <div class="error-analysis-card">
-        <h3>
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+        
+        <!-- Error Banner -->
+        <div id="error" class="error-banner" style="display: none;">
+            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                 <circle cx="12" cy="12" r="10"/>
                 <line x1="12" y1="8" x2="12" y2="12"/>
                 <line x1="12" y1="16" x2="12.01" y2="16"/>
             </svg>
-            Error Analysis
-        </h3>
-        <div class="error-list" id="errorList">
-            <span class="loading">Loading...</span>
+            <span id="errorText"></span>
         </div>
-    </div>
-    
-    <div class="error-analysis-card">
-        <h3>
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/>
-                <line x1="12" y1="9" x2="12" y2="13"/>
-                <line x1="12" y1="17" x2="12.01" y2="17"/>
-            </svg>
-            Apps with Highest Failure Rates
-        </h3>
-        <div class="failed-apps-grid" id="failedAppsGrid">
-            <span class="loading">Loading...</span>
+        
+        <!-- Stats Cards -->
+        <div class="stats-grid">
+            <div class="stat-card">
+                <div class="stat-card-header">
+                    <span class="stat-card-label">Total Created</span>
+                    <div class="stat-card-icon">
+                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+                            <line x1="9" y1="9" x2="15" y2="9"/>
+                            <line x1="9" y1="13" x2="15" y2="13"/>
+                            <line x1="9" y1="17" x2="11" y2="17"/>
+                        </svg>
+                    </div>
+                </div>
+                <div class="stat-card-value" id="totalInstalls">-</div>
+                <div class="stat-card-subtitle">Total LXC/VM entries found</div>
+            </div>
+            
+            <div class="stat-card success">
+                <div class="stat-card-header">
+                    <span class="stat-card-label">Success Rate</span>
+                    <div class="stat-card-icon">
+                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/>
+                            <polyline points="22 4 12 14.01 9 11.01"/>
+                        </svg>
+                    </div>
+                </div>
+                <div class="stat-card-value" id="successRate">-</div>
+                <div class="stat-card-subtitle" id="successSubtitle">successful installations</div>
+            </div>
+            
+            <div class="stat-card failed">
+                <div class="stat-card-header">
+                    <span class="stat-card-label">Failures</span>
+                    <div class="stat-card-icon">
+                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <circle cx="12" cy="12" r="10"/>
+                            <line x1="15" y1="9" x2="9" y2="15"/>
+                            <line x1="9" y1="9" x2="15" y2="15"/>
+                        </svg>
+                    </div>
+                </div>
+                <div class="stat-card-value" id="failedCount">-</div>
+                <div class="stat-card-subtitle">Installations encountered errors</div>
+            </div>
+            
+            <div class="stat-card popular">
+                <div class="stat-card-header">
+                    <span class="stat-card-label">Most Popular</span>
+                    <div class="stat-card-icon">
+                        <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M12 2L15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2z"/>
+                        </svg>
+                    </div>
+                </div>
+                <div class="stat-card-value" id="mostPopular">-</div>
+                <div class="stat-card-subtitle" id="popularSubtitle">installations</div>
+            </div>
         </div>
-    </div>
-    
-    <div class="table-card">
-        <h3>Recent Installations</h3>
-        <div class="filters">
-            <input type="text" id="filterApp" placeholder="Filter by app..." oninput="filterTable()">
-            <select id="filterStatus" onchange="filterTable()">
-                <option value="">All Status</option>
-                <option value="success">Success</option>
-                <option value="failed">Failed</option>
-                <option value="installing">Installing</option>
-            </select>
-            <select id="filterOs" onchange="filterTable()">
-                <option value="">All OS</option>
-            </select>
+        
+        <!-- Top Applications Section -->
+        <div class="section-card">
+            <div class="section-header">
+                <div>
+                    <h2>Top Applications</h2>
+                    <p>The most frequently installed applications.</p>
+                </div>
+                <div class="section-actions">
+                    <button class="btn" id="viewAllAppsBtn" onclick="toggleAllApps()">
+                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <line x1="8" y1="6" x2="21" y2="6"/>
+                            <line x1="8" y1="12" x2="21" y2="12"/>
+                            <line x1="8" y1="18" x2="21" y2="18"/>
+                            <line x1="3" y1="6" x2="3.01" y2="6"/>
+                            <line x1="3" y1="12" x2="3.01" y2="12"/>
+                            <line x1="3" y1="18" x2="3.01" y2="18"/>
+                        </svg>
+                        View All
+                    </button>
+                </div>
+            </div>
+            <div class="chart-container" id="appsChartContainer">
+                <canvas id="appsChart"></canvas>
+            </div>
         </div>
-        <table id="installTable">
-            <thead>
-                <tr>
-                    <th data-sort="nsapp" class="sortable">App</th>
-                    <th data-sort="status" class="sortable">Status</th>
-                    <th data-sort="os_type" class="sortable">OS</th>
-                    <th data-sort="type" class="sortable">Type</th>
-                    <th data-sort="method" class="sortable">Method</th>
-                    <th>Resources</th>
-                    <th data-sort="exit_code" class="sortable">Exit Code</th>
-                    <th>Error</th>
-                    <th data-sort="created" class="sortable sort-desc">Created ▼</th>
-                </tr>
-            </thead>
-            <tbody id="recordsTable">
-                <tr><td colspan="9" class="loading">Loading...</td></tr>
-            </tbody>
-        </table>
-        <div class="pagination">
-            <button onclick="prevPage()" id="prevBtn" disabled>← Previous</button>
-            <span id="pageInfo">Page 1</span>
-            <button onclick="nextPage()" id="nextBtn">Next →</button>
+        
+        <!-- Secondary Charts -->
+        <div class="charts-grid">
+            <div class="chart-card">
+                <h3>Installations Over Time</h3>
+                <div class="chart-wrapper">
+                    <canvas id="dailyChart"></canvas>
+                </div>
+            </div>
+            <div class="chart-card">
+                <h3>OS Distribution</h3>
+                <div class="chart-wrapper">
+                    <canvas id="osChart"></canvas>
+                </div>
+            </div>
+            <div class="chart-card">
+                <h3>Status Distribution</h3>
+                <div class="chart-wrapper">
+                    <canvas id="statusChart"></canvas>
+                </div>
+            </div>
         </div>
-    </div>
-    
-    <div class="footer">
-        <div>
-            <a href="https://github.com/community-scripts/ProxmoxVED" target="_blank">ProxmoxVE Helper Scripts</a> 
-            &bull; Telemetry is anonymous and privacy-friendly
+        
+        <!-- Error Analysis Section -->
+        <div class="section-card">
+            <div class="section-header">
+                <div>
+                    <h2>Error Analysis</h2>
+                    <p>Common error patterns and affected applications.</p>
+                </div>
+            </div>
+            <div class="error-list" id="errorList">
+                <div class="loading"><div class="loading-spinner"></div>Loading...</div>
+            </div>
         </div>
-        <div>
-            <button class="footer-btn" onclick="showHealthCheck()">Health Check</button>
-            <a href="/api/dashboard" target="_blank">API</a>
+        
+        <!-- Failed Apps Section -->
+        <div class="section-card">
+            <div class="section-header">
+                <div>
+                    <h2>Apps with Highest Failure Rates</h2>
+                    <p>Applications that need attention.</p>
+                </div>
+            </div>
+            <div class="failed-apps-grid" id="failedAppsGrid">
+                <div class="loading"><div class="loading-spinner"></div>Loading...</div>
+            </div>
+        </div>
+        
+        <!-- Installation Log Section -->
+        <div class="section-card">
+            <div class="section-header">
+                <div>
+                    <h2>Installation Log</h2>
+                    <p>Detailed records of all container creation attempts.</p>
+                </div>
+                <div class="section-actions">
+                    <button class="btn" onclick="exportCSV()">
+                        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                            <path d="M21 15v4a2 2 0 01-2 2H5a2 2 0 01-2-2v-4"/>
+                            <polyline points="7 10 12 15 17 10"/>
+                            <line x1="12" y1="15" x2="12" y2="3"/>
+                        </svg>
+                        Export CSV
+                    </button>
+                </div>
+            </div>
+            <div class="filters-bar">
+                <input type="text" class="search-input" id="filterApp" placeholder="Filter by application..." oninput="filterTable()">
+                <select id="filterStatus" class="custom-select" onchange="filterTable()">
+                    <option value="">All Status</option>
+                    <option value="success">Success</option>
+                    <option value="failed">Failed</option>
+                    <option value="installing">Installing</option>
+                    <option value="unknown">Unknown</option>
+                </select>
+                <select id="filterOs" class="custom-select" onchange="filterTable()">
+                    <option value="">All OS</option>
+                </select>
+                <select id="filterType" class="custom-select" onchange="filterTable()">
+                    <option value="">All Types</option>
+                    <option value="lxc">LXC</option>
+                    <option value="vm">VM</option>
+                </select>
+            </div>
+            <div class="table-wrapper">
+                <table id="installTable">
+                    <thead>
+                        <tr>
+                            <th data-sort="status" class="sortable">Status</th>
+                            <th data-sort="type" class="sortable">Type</th>
+                            <th data-sort="nsapp" class="sortable">Application</th>
+                            <th data-sort="os_type" class="sortable">OS</th>
+                            <th>Disk Size</th>
+                            <th>Core Count</th>
+                            <th>RAM Size</th>
+                            <th data-sort="created" class="sortable sort-desc">Created At</th>
+                        </tr>
+                    </thead>
+                    <tbody id="recordsTable">
+                        <tr><td colspan="8"><div class="loading"><div class="loading-spinner"></div>Loading...</div></td></tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="table-footer">
+                <div class="per-page-select">
+                    <label>Show:</label>
+                    <select id="perPageSelect" class="custom-select" onchange="changePerPage()">
+                        <option value="25" selected>25</option>
+                        <option value="50">50</option>
+                        <option value="100">100</option>
+                    </select>
+                </div>
+                <div class="pagination">
+                    <button onclick="prevPage()" id="prevBtn" disabled>Previous</button>
+                    <span class="pagination-info" id="pageInfo">Page 1</span>
+                    <button onclick="nextPage()" id="nextBtn">Next</button>
+                </div>
+            </div>
         </div>
     </div>
     
@@ -1583,11 +2130,11 @@ func DashboardHTML() string {
     <div class="modal-overlay" id="healthModal" onclick="closeHealthModal(event)">
         <div class="modal-content health-modal" onclick="event.stopPropagation()">
             <div class="modal-header">
-                <h2>🏥 Health Check</h2>
+                <h2>Health Check</h2>
                 <button class="modal-close" onclick="closeHealthModal()">&times;</button>
             </div>
             <div class="modal-body" id="healthModalBody">
-                <div class="loading">Checking...</div>
+                <div class="loading"><div class="loading-spinner"></div>Checking...</div>
             </div>
         </div>
     </div>
@@ -1616,17 +2163,42 @@ func DashboardHTML() string {
     <script>
         let charts = {};
         let allRecords = [];
+        let allAppsData = [];
+        let showingAllApps = false;
         let currentPage = 1;
         let totalPages = 1;
+        let perPage = 25;
         let currentTheme = localStorage.getItem('theme') || 'dark';
         let currentSort = { field: 'created', dir: 'desc' };
         
+        // Colorful palette for Top Applications chart
+        const appBarColors = [
+            '#3b82f6', '#f97316', '#22c55e', '#a855f7', '#ef4444',
+            '#22d3ee', '#eab308', '#ec4899', '#84cc16', '#6366f1',
+            '#14b8a6', '#f43f5e', '#8b5cf6', '#10b981', '#06b6d4',
+            '#d946ef', '#facc15', '#2dd4bf'
+        ];
+        
         // Apply saved theme on load
         if (currentTheme === 'light') {
             document.documentElement.setAttribute('data-theme', 'light');
             document.getElementById('themeIcon').textContent = '☀️';
         }
         
+        // Fetch GitHub stars
+        async function fetchGitHubStars() {
+            try {
+                const resp = await fetch('https://api.github.com/repos/community-scripts/ProxmoxVE');
+                const data = await resp.json();
+                if (data.stargazers_count) {
+                    document.getElementById('starCount').textContent = data.stargazers_count.toLocaleString();
+                }
+            } catch (e) {
+                console.log('Could not fetch GitHub stars');
+            }
+        }
+        fetchGitHubStars();
+        
         function toggleTheme() {
             if (currentTheme === 'dark') {
                 document.documentElement.setAttribute('data-theme', 'light');
@@ -1638,80 +2210,106 @@ func DashboardHTML() string {
                 currentTheme = 'dark';
             }
             localStorage.setItem('theme', currentTheme);
-            // Redraw charts with new colors
             if (Object.keys(charts).length > 0) {
                 refreshData();
             }
         }
         
-        const chartColors = {
-            blue: 'rgba(88, 166, 255, 0.8)',
-            green: 'rgba(63, 185, 80, 0.8)',
-            red: 'rgba(248, 81, 73, 0.8)',
-            yellow: 'rgba(210, 153, 34, 0.8)',
-            purple: 'rgba(163, 113, 247, 0.8)',
-            gray: 'rgba(139, 148, 158, 0.8)'
-        };
+        function handleGlobalSearch(event) {
+            if (event.key === 'Enter') {
+                const query = event.target.value.trim();
+                if (query) {
+                    document.getElementById('filterApp').value = query;
+                    filterTable();
+                    document.querySelector('.section-card:last-of-type').scrollIntoView({ behavior: 'smooth' });
+                }
+            }
+        }
+        
+        // Keyboard shortcut for search
+        document.addEventListener('keydown', function(e) {
+            if ((e.ctrlKey || e.metaKey) && e.key === 'k') {
+                e.preventDefault();
+                document.getElementById('globalSearch').focus();
+            }
+        });
         
         const chartDefaults = {
             responsive: true,
             maintainAspectRatio: false,
             plugins: {
                 legend: {
-                    labels: { color: '#c9d1d9' }
+                    labels: { color: '#8b949e' }
                 }
             },
             scales: {
                 x: {
                     ticks: { color: '#8b949e' },
-                    grid: { color: '#30363d' }
+                    grid: { color: '#2d3748' }
                 },
                 y: {
                     ticks: { color: '#8b949e' },
-                    grid: { color: '#30363d' }
+                    grid: { color: '#2d3748' }
                 }
             }
         };
         
         async function fetchData() {
             const activeBtn = document.querySelector('.filter-btn.active');
-            const days = activeBtn ? activeBtn.dataset.days : '30';
+            const days = activeBtn ? activeBtn.dataset.days : '7';
+            const repo = document.getElementById('repoFilter').value;
+            
+            // Show loading indicator
+            document.getElementById('loadingIndicator').style.display = 'flex';
+            document.getElementById('cacheStatus').textContent = '';
+            
             try {
-                const response = await fetch('/api/dashboard?days=' + days);
+                const response = await fetch('/api/dashboard?days=' + days + '&repo=' + repo);
                 if (!response.ok) throw new Error('Failed to fetch data');
+                
+                // Check cache status from header
+                const cacheHit = response.headers.get('X-Cache') === 'HIT';
+                document.getElementById('cacheStatus').textContent = cacheHit ? '(cached)' : '(fresh)';
+                
                 return await response.json();
             } catch (error) {
-                document.getElementById('error').style.display = 'block';
-                document.getElementById('error').textContent = 'Error: ' + error.message;
+                document.getElementById('error').style.display = 'flex';
+                document.getElementById('errorText').textContent = error.message;
                 throw error;
+            } finally {
+                document.getElementById('loadingIndicator').style.display = 'none';
             }
         }
         
         function updateStats(data) {
-            document.getElementById('totalInstalls').textContent = data.total_installs.toLocaleString();
-            document.getElementById('successCount').textContent = data.success_count.toLocaleString();
+            // Use total_all_time for display if available, otherwise total_installs
+            const displayTotal = data.total_all_time || data.total_installs;
+            document.getElementById('totalInstalls').textContent = displayTotal.toLocaleString();
+            
+            // Show sample info if data was sampled
+            const sampleInfo = document.getElementById('sampleInfo');
+            if (sampleInfo && data.sample_size && data.sample_size < data.total_all_time) {
+                sampleInfo.textContent = '(based on ' + data.sample_size.toLocaleString() + ' recent records)';
+                sampleInfo.style.display = 'block';
+            } else if (sampleInfo) {
+                sampleInfo.style.display = 'none';
+            }
+            
             document.getElementById('failedCount').textContent = data.failed_count.toLocaleString();
-            document.getElementById('installingCount').textContent = data.installing_count.toLocaleString();
             document.getElementById('successRate').textContent = data.success_rate.toFixed(1) + '%';
-            document.getElementById('lastUpdated').textContent = 'Updated: ' + new Date().toLocaleTimeString();
+            document.getElementById('successSubtitle').textContent = data.success_count.toLocaleString() + ' successful installations';
+            document.getElementById('lastUpdated').textContent = 'Updated ' + new Date().toLocaleTimeString();
             document.getElementById('error').style.display = 'none';
             
-            // Type stats (LXC/VM)
-            if (data.type_stats && data.type_stats.length > 0) {
-                const lxc = data.type_stats.find(t => t.type === 'lxc');
-                const vm = data.type_stats.find(t => t.type === 'vm');
-                document.getElementById('typeStats').textContent = 
-                    (lxc ? lxc.count.toLocaleString() : '0') + ' / ' + (vm ? vm.count.toLocaleString() : '0');
+            // Most Popular App
+            if (data.top_apps && data.top_apps.length > 0) {
+                const topApp = data.top_apps[0];
+                document.getElementById('mostPopular').textContent = topApp.app;
+                document.getElementById('popularSubtitle').textContent = topApp.count.toLocaleString() + ' installations';
             }
             
-            // PVE Versions
-            if (data.pve_versions && data.pve_versions.length > 0) {
-                document.getElementById('pveVersions').innerHTML = data.pve_versions.map(p => 
-                    '<span class="pve-badge">PVE ' + (p.version || 'unknown') + ' <span class="count">' + p.count + '</span></span>'
-                ).join('');
-            } else {
-                document.getElementById('pveVersions').innerHTML = '<span>No version data</span>';
-            }
+            // Store all apps data for View All feature
+            allAppsData = data.top_apps || [];
             
             // Error Analysis
             updateErrorAnalysis(data.error_analysis || []);
@@ -1723,7 +2321,7 @@ func DashboardHTML() string {
         function updateErrorAnalysis(errors) {
             const container = document.getElementById('errorList');
             if (!errors || errors.length === 0) {
-                container.innerHTML = '<span class="loading">No errors recorded</span>';
+                container.innerHTML = '<div style="padding: 20px; color: var(--text-muted); text-align: center;">No errors recorded</div>';
                 return;
             }
             
@@ -1733,7 +2331,7 @@ func DashboardHTML() string {
                         '<div class="pattern">' + escapeHtml(e.pattern) + '</div>' +
                         '<div class="meta">Affects: ' + escapeHtml(e.apps) + '</div>' +
                     '</div>' +
-                    '<span class="count-badge">' + e.count + ' apps</span>' +
+                    '<span class="count-badge">' + e.count + '</span>' +
                 '</div>'
             ).join('');
         }
@@ -1741,7 +2339,7 @@ func DashboardHTML() string {
         function updateFailedApps(apps) {
             const container = document.getElementById('failedAppsGrid');
             if (!apps || apps.length === 0) {
-                container.innerHTML = '<span class="loading">No failures recorded</span>';
+                container.innerHTML = '<div style="padding: 20px; color: var(--text-muted); text-align: center;">No failures recorded</div>';
                 return;
             }
             
@@ -1762,20 +2360,15 @@ func DashboardHTML() string {
         function formatTimestamp(ts) {
             if (!ts) return '-';
             const d = new Date(ts);
-            const now = new Date();
-            const diff = now - d;
-            
-            // Less than 1 minute ago
-            if (diff < 60000) return 'just now';
-            // Less than 1 hour ago
-            if (diff < 3600000) return Math.floor(diff / 60000) + 'm ago';
-            // Less than 24 hours ago
-            if (diff < 86400000) return Math.floor(diff / 3600000) + 'h ago';
-            // Less than 7 days ago
-            if (diff < 604800000) return Math.floor(diff / 86400000) + 'd ago';
-            
-            // Older - show date
-            return d.toLocaleDateString() + ' ' + d.toLocaleTimeString([], {hour: '2-digit', minute:'2-digit'});
+            // Format: "Feb 11, 2026, 4:33 PM"
+            return d.toLocaleDateString('en-US', { 
+                month: 'short', 
+                day: 'numeric', 
+                year: 'numeric',
+                hour: 'numeric',
+                minute: '2-digit',
+                hour12: true
+            });
         }
         
         function initSortableHeaders() {
@@ -1786,7 +2379,6 @@ func DashboardHTML() string {
         }
         
         function sortByColumn(field) {
-            // Toggle direction if same field
             if (currentSort.field === field) {
                 currentSort.dir = currentSort.dir === 'asc' ? 'desc' : 'asc';
             } else {
@@ -1794,51 +2386,153 @@ func DashboardHTML() string {
                 currentSort.dir = 'desc';
             }
             
-            // Update header indicators
             document.querySelectorAll('th.sortable').forEach(th => {
                 th.classList.remove('sort-asc', 'sort-desc');
-                const arrow = th.textContent.replace(/[▲▼]/g, '').trim();
-                th.textContent = arrow;
+                th.textContent = th.textContent.replace(/[▲▼]/g, '').trim();
             });
             
             const activeTh = document.querySelector('th[data-sort=\"' + field + '\"]');
             if (activeTh) {
                 activeTh.classList.add(currentSort.dir === 'asc' ? 'sort-asc' : 'sort-desc');
-                activeTh.textContent = activeTh.textContent + ' ' + (currentSort.dir === 'asc' ? '▲' : '▼');
+                activeTh.textContent += ' ' + (currentSort.dir === 'asc' ? '▲' : '▼');
             }
             
-            // Re-fetch with new sort
             currentPage = 1;
             fetchPaginatedRecords();
         }
         
+        function toggleAllApps() {
+            showingAllApps = !showingAllApps;
+            const btn = document.getElementById('viewAllAppsBtn');
+            const container = document.getElementById('appsChartContainer');
+            
+            if (showingAllApps) {
+                btn.innerHTML = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="4 14 10 14 10 20"/><polyline points="20 10 14 10 14 4"/><line x1="14" y1="10" x2="21" y2="3"/><line x1="3" y1="21" x2="10" y2="14"/></svg> Show Less';
+                container.style.height = '600px';
+            } else {
+                btn.innerHTML = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg> View All';
+                container.style.height = '420px';
+            }
+            
+            updateAppsChart(allAppsData);
+        }
+        
+        function updateAppsChart(topApps) {
+            const displayApps = showingAllApps ? topApps.slice(0, 30) : topApps.slice(0, 15);
+            const colors = displayApps.map((_, i) => appBarColors[i % appBarColors.length]);
+            
+            if (charts.apps) charts.apps.destroy();
+            charts.apps = new Chart(document.getElementById('appsChart'), {
+                type: 'bar',
+                data: {
+                    labels: displayApps.map(a => a.app),
+                    datasets: [{
+                        label: 'Installations',
+                        data: displayApps.map(a => a.count),
+                        backgroundColor: colors,
+                        borderRadius: 6,
+                        borderSkipped: false
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    indexAxis: 'x',
+                    plugins: { 
+                        legend: { display: false },
+                        tooltip: {
+                            backgroundColor: 'rgba(21, 27, 35, 0.95)',
+                            titleColor: '#e2e8f0',
+                            bodyColor: '#e2e8f0',
+                            borderColor: '#2d3748',
+                            borderWidth: 1,
+                            padding: 12,
+                            displayColors: true,
+                            callbacks: {
+                                label: function(ctx) {
+                                    return ctx.parsed.y.toLocaleString() + ' installations';
+                                }
+                            }
+                        }
+                    },
+                    scales: {
+                        x: {
+                            ticks: { 
+                                color: '#8b949e',
+                                maxRotation: 45,
+                                minRotation: 45
+                            },
+                            grid: { display: false }
+                        },
+                        y: {
+                            beginAtZero: true,
+                            ticks: { 
+                                color: '#8b949e',
+                                callback: function(value) { 
+                                    if (value >= 1000) return (value/1000).toFixed(0) + 'k';
+                                    return value;
+                                }
+                            },
+                            grid: { color: '#2d3748' }
+                        }
+                    }
+                }
+            });
+        }
+        
         function updateCharts(data) {
             // Daily chart
             if (charts.daily) charts.daily.destroy();
             charts.daily = new Chart(document.getElementById('dailyChart'), {
                 type: 'line',
                 data: {
-                    labels: data.daily_stats.map(d => d.date.slice(5)), // MM-DD
+                    labels: data.daily_stats.map(d => d.date.slice(5)),
                     datasets: [
                         {
                             label: 'Success',
                             data: data.daily_stats.map(d => d.success),
-                            borderColor: chartColors.green,
-                            backgroundColor: 'rgba(63, 185, 80, 0.1)',
+                            borderColor: '#22c55e',
+                            backgroundColor: 'rgba(34, 197, 94, 0.1)',
                             fill: true,
-                            tension: 0.3
+                            tension: 0.4,
+                            borderWidth: 2
                         },
                         {
                             label: 'Failed',
                             data: data.daily_stats.map(d => d.failed),
-                            borderColor: chartColors.red,
-                            backgroundColor: 'rgba(248, 81, 73, 0.1)',
+                            borderColor: '#ef4444',
+                            backgroundColor: 'rgba(239, 68, 68, 0.1)',
                             fill: true,
-                            tension: 0.3
+                            tension: 0.4,
+                            borderWidth: 2
                         }
                     ]
                 },
-                options: chartDefaults
+                options: {
+                    ...chartDefaults,
+                    plugins: { legend: { display: true, position: 'top', labels: { color: '#8b949e', usePointStyle: true } } }
+                }
+            });
+            
+            // OS distribution pie chart
+            if (charts.os) charts.os.destroy();
+            charts.os = new Chart(document.getElementById('osChart'), {
+                type: 'doughnut',
+                data: {
+                    labels: data.os_distribution.map(o => o.os),
+                    datasets: [{
+                        data: data.os_distribution.map(o => o.count),
+                        backgroundColor: appBarColors.slice(0, data.os_distribution.length),
+                        borderWidth: 0
+                    }]
+                },
+                options: {
+                    responsive: true,
+                    maintainAspectRatio: false,
+                    plugins: {
+                        legend: { position: 'right', labels: { color: '#8b949e', padding: 12 } }
+                    }
+                }
             });
             
             // Status pie chart
@@ -1849,99 +2543,21 @@ func DashboardHTML() string {
                     labels: ['Success', 'Failed', 'Installing'],
                     datasets: [{
                         data: [data.success_count, data.failed_count, data.installing_count],
-                        backgroundColor: [chartColors.green, chartColors.red, chartColors.yellow]
+                        backgroundColor: ['#22c55e', '#ef4444', '#eab308'],
+                        borderWidth: 0
                     }]
                 },
                 options: {
                     responsive: true,
                     maintainAspectRatio: false,
                     plugins: {
-                        legend: {
-                            position: 'bottom',
-                            labels: { color: '#c9d1d9' }
-                        }
+                        legend: { position: 'right', labels: { color: '#8b949e', padding: 12 } }
                     }
                 }
             });
             
             // Top apps chart
-            if (charts.apps) charts.apps.destroy();
-            charts.apps = new Chart(document.getElementById('appsChart'), {
-                type: 'bar',
-                data: {
-                    labels: data.top_apps.map(a => a.app),
-                    datasets: [{
-                        label: 'Installations',
-                        data: data.top_apps.map(a => a.count),
-                        backgroundColor: chartColors.blue
-                    }]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    indexAxis: 'y',
-                    plugins: { legend: { display: false } },
-                    scales: {
-                        x: {
-                            beginAtZero: true,
-                            ticks: { 
-                                color: '#8b949e',
-                                stepSize: 1,
-                                callback: function(value) { return Number.isInteger(value) ? value : ''; }
-                            },
-                            grid: { color: '#30363d' }
-                        },
-                        y: {
-                            ticks: { color: '#8b949e' },
-                            grid: { color: '#30363d' }
-                        }
-                    }
-                }
-            });
-            
-            // OS distribution chart
-            if (charts.os) charts.os.destroy();
-            charts.os = new Chart(document.getElementById('osChart'), {
-                type: 'pie',
-                data: {
-                    labels: data.os_distribution.map(o => o.os),
-                    datasets: [{
-                        data: data.os_distribution.map(o => o.count),
-                        backgroundColor: [
-                            chartColors.blue, chartColors.green, chartColors.purple,
-                            chartColors.yellow, chartColors.red, chartColors.gray
-                        ]
-                    }]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    plugins: {
-                        legend: {
-                            position: 'right',
-                            labels: { color: '#c9d1d9' }
-                        }
-                    }
-                }
-            });
-            
-            // Method chart
-            if (charts.method) charts.method.destroy();
-            charts.method = new Chart(document.getElementById('methodChart'), {
-                type: 'bar',
-                data: {
-                    labels: data.method_stats.map(m => m.method || 'default'),
-                    datasets: [{
-                        label: 'Count',
-                        data: data.method_stats.map(m => m.count),
-                        backgroundColor: chartColors.purple
-                    }]
-                },
-                options: {
-                    ...chartDefaults,
-                    plugins: { legend: { display: false } }
-                }
-            });
+            updateAppsChart(data.top_apps || []);
         }
         
         function updateTable(records) {
@@ -1956,16 +2572,24 @@ func DashboardHTML() string {
             filterTable();
         }
         
+        function changePerPage() {
+            perPage = parseInt(document.getElementById('perPageSelect').value);
+            currentPage = 1;
+            fetchPaginatedRecords();
+        }
+        
         async function fetchPaginatedRecords() {
             const status = document.getElementById('filterStatus').value;
             const app = document.getElementById('filterApp').value;
             const os = document.getElementById('filterOs').value;
+            const type = document.getElementById('filterType').value;
             
             try {
-                let url = '/api/records?page=' + currentPage + '&limit=50';
+                let url = '/api/records?page=' + currentPage + '&limit=' + perPage;
                 if (status) url += '&status=' + encodeURIComponent(status);
                 if (app) url += '&app=' + encodeURIComponent(app);
                 if (os) url += '&os=' + encodeURIComponent(os);
+                if (type) url += '&type=' + encodeURIComponent(type);
                 if (currentSort.field) {
                     url += '&sort=' + (currentSort.dir === 'desc' ? '-' : '') + currentSort.field;
                 }
@@ -2004,30 +2628,31 @@ func DashboardHTML() string {
         
         function renderTableRows(records) {
             const tbody = document.getElementById('recordsTable');
-            currentRecords = records; // Store for detail modal
+            currentRecords = records;
             
             if (records.length === 0) {
-                tbody.innerHTML = '<tr><td colspan="9" class="loading">No records found</td></tr>';
+                tbody.innerHTML = '<tr><td colspan="8"><div class="loading" style="padding: 40px;">No records found</div></td></tr>';
                 return;
             }
             
             tbody.innerHTML = records.map((r, index) => {
                 const statusClass = r.status || 'unknown';
-                const resources = r.core_count || r.ram_size || r.disk_size 
-                    ? (r.core_count || '?') + 'C / ' + (r.ram_size ? Math.round(r.ram_size/1024) + 'G' : '?') + ' / ' + (r.disk_size || '?') + 'GB'
-                    : '-';
+                const typeClass = (r.type || '').toLowerCase();
+                const diskSize = r.disk_size ? r.disk_size + 'GB' : '-';
+                const coreCount = r.core_count || '-';
+                const ramSize = r.ram_size ? r.ram_size + 'MB' : '-';
                 const created = r.created ? formatTimestamp(r.created) : '-';
+                const osDisplay = r.os_type ? (r.os_type + (r.os_version ? ' ' + r.os_version : '')) : '-';
+                
                 return '<tr class="clickable-row" onclick="showRecordDetail(' + index + ')">' +
+                    '<td><span class="status-badge ' + statusClass + '">' + escapeHtml(r.status || 'unknown') + '</span></td>' +
+                    '<td><span class="type-badge ' + typeClass + '">' + escapeHtml((r.type || '-').toUpperCase()) + '</span></td>' +
                     '<td><strong>' + escapeHtml(r.nsapp || '-') + '</strong></td>' +
-                    '<td><span class="status-badge ' + statusClass + '">' + escapeHtml(r.status || '-') + '</span></td>' +
-                    '<td>' + escapeHtml(r.os_type || '-') + ' ' + escapeHtml(r.os_version || '') + '</td>' +
-                    '<td>' + escapeHtml(r.type || '-') + '</td>' +
-                    '<td>' + escapeHtml(r.method || 'default') + '</td>' +
-                    '<td>' + resources + '</td>' +
-                    '<td>' + (r.exit_code || '-') + '</td>' +
-                    '<td title="' + escapeHtml(r.error || '') + '">' + 
-                        escapeHtml((r.error || '').slice(0, 40)) + (r.error && r.error.length > 40 ? '...' : '') + '</td>' +
-                    '<td title="' + escapeHtml(r.created || '') + '">' + created + '</td>' +
+                    '<td>' + escapeHtml(osDisplay) + '</td>' +
+                    '<td>' + diskSize + '</td>' +
+                    '<td style="text-align: center;">' + coreCount + '</td>' +
+                    '<td>' + ramSize + '</td>' +
+                    '<td>' + created + '</td>' +
                 '</tr>';
             }).join('');
         }
diff --git a/misc/data/entrypoint.sh b/misc/data/entrypoint.sh
index a25423bea..67c09b28d 100644
--- a/misc/data/entrypoint.sh
+++ b/misc/data/entrypoint.sh
@@ -12,43 +12,43 @@ export POCKETBASE_COLLECTION="${POCKETBASE_COLLECTION:-$PB_TARGET_COLLECTION}"
 
 # Run migration if enabled
 if [ "$RUN_MIGRATION" = "true" ]; then
-  echo ""
-  echo "🔄 Migration mode enabled"
-  echo "   Source: $MIGRATION_SOURCE_URL"
-  echo "   Target: $POCKETBASE_URL"
-  echo "   Collection: $POCKETBASE_COLLECTION"
-  echo ""
-
-  # Wait for PocketBase to be ready
-  echo "⏳ Waiting for PocketBase to be ready..."
-  RETRIES=30
-  until wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; do
-    RETRIES=$((RETRIES - 1))
-    if [ $RETRIES -le 0 ]; then
-      echo "❌ PocketBase not reachable after 30 attempts"
-      if [ "$MIGRATION_REQUIRED" = "true" ]; then
-        exit 1
-      fi
-      echo "⚠️  Continuing without migration..."
-      break
+    echo ""
+    echo "🔄 Migration mode enabled"
+    echo "   Source: $MIGRATION_SOURCE_URL"
+    echo "   Target: $POCKETBASE_URL"
+    echo "   Collection: $POCKETBASE_COLLECTION"
+    echo ""
+    
+    # Wait for PocketBase to be ready
+    echo "⏳ Waiting for PocketBase to be ready..."
+    RETRIES=30
+    until wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; do
+        RETRIES=$((RETRIES - 1))
+        if [ $RETRIES -le 0 ]; then
+            echo "❌ PocketBase not reachable after 30 attempts"
+            if [ "$MIGRATION_REQUIRED" = "true" ]; then
+                exit 1
+            fi
+            echo "⚠️  Continuing without migration..."
+            break
+        fi
+        echo "   Waiting... ($RETRIES attempts left)"
+        sleep 2
+    done
+    
+    if wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; then
+        echo "✅ PocketBase is ready"
+        echo ""
+        echo "🚀 Starting migration..."
+        /app/migrate || {
+            if [ "$MIGRATION_REQUIRED" = "true" ]; then
+                echo "❌ Migration failed!"
+                exit 1
+            fi
+            echo "⚠️  Migration failed, but continuing..."
+        }
+        echo ""
     fi
-    echo "   Waiting... ($RETRIES attempts left)"
-    sleep 2
-  done
-
-  if wget -q --spider "$POCKETBASE_URL/api/health" 2>/dev/null; then
-    echo "✅ PocketBase is ready"
-    echo ""
-    echo "🚀 Starting migration..."
-    /app/migrate || {
-      if [ "$MIGRATION_REQUIRED" = "true" ]; then
-        echo "❌ Migration failed!"
-        exit 1
-      fi
-      echo "⚠️  Migration failed, but continuing..."
-    }
-    echo ""
-  fi
 fi
 
 echo "🚀 Starting telemetry service..."
diff --git a/misc/data/migrate.go b/misc/data/migrate.go
index 7212c2dee..e9b161013 100644
--- a/misc/data/migrate.go
+++ b/misc/data/migrate.go
@@ -93,13 +93,13 @@ func main() {
 		pbCollection = os.Getenv("PB_TARGET_COLLECTION")
 	}
 	if pbCollection == "" {
-		pbCollection = "_dev_telemetry_data"
+		pbCollection = "telemetry"
 	}
 
 	// Auth collection
 	authCollection := os.Getenv("PB_AUTH_COLLECTION")
 	if authCollection == "" {
-		authCollection = "_dev_telemetry_service"
+		authCollection = "telemetry_service_user"
 	}
 
 	// Credentials
diff --git a/misc/data/migrate.sh b/misc/data/migrate.sh
index 1da9e25ea..09d086cc9 100755
--- a/misc/data/migrate.sh
+++ b/misc/data/migrate.sh
@@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # Default values
 POCKETBASE_URL="${1:-http://localhost:8090}"
-POCKETBASE_COLLECTION="${2:-_dev_telemetry_data}"
+POCKETBASE_COLLECTION="${2:-telemetry}"
 
 echo "============================================="
 echo "   ProxmoxVED Data Migration Tool"
@@ -27,10 +27,10 @@ echo ""
 
 # Check if PocketBase is reachable
 echo "🔍 Checking PocketBase connection..."
-if ! curl -sf "$POCKETBASE_URL/api/health" > /dev/null 2>&1; then
-    echo "❌ Cannot reach PocketBase at $POCKETBASE_URL"
-    echo "   Make sure PocketBase is running and the URL is correct."
-    exit 1
+if ! curl -sf "$POCKETBASE_URL/api/health" >/dev/null 2>&1; then
+  echo "❌ Cannot reach PocketBase at $POCKETBASE_URL"
+  echo "   Make sure PocketBase is running and the URL is correct."
+  exit 1
 fi
 echo "✅ PocketBase is reachable"
 echo ""
@@ -39,8 +39,8 @@ echo ""
 echo "🔍 Checking source API..."
 SUMMARY=$(curl -sf "https://api.htl-braunau.at/dev/data/summary" 2>/dev/null || echo "")
 if [ -z "$SUMMARY" ]; then
-    echo "❌ Cannot reach source API"
-    exit 1
+  echo "❌ Cannot reach source API"
+  exit 1
 fi
 
 TOTAL=$(echo "$SUMMARY" | grep -o '"total_entries":[0-9]*' | cut -d: -f2)
@@ -51,8 +51,8 @@ echo ""
 read -p "⚠️  Do you want to start the migration? [y/N] " -n 1 -r
 echo ""
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "Migration cancelled."
-    exit 0
+  echo "Migration cancelled."
+  exit 0
 fi
 
 echo ""
diff --git a/misc/data/migration/fix-timestamps.sh b/misc/data/migration/fix-timestamps.sh
new file mode 100644
index 000000000..a3af395d1
--- /dev/null
+++ b/misc/data/migration/fix-timestamps.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+# Post-migration script to fix timestamps in PocketBase
+# Run this INSIDE the PocketBase container after migration completes
+#
+# Usage: ./fix-timestamps.sh
+
+set -e
+
+DB_PATH="/app/pb_data/data.db"
+
+echo "==========================================================="
+echo "   Fix Timestamps in PocketBase"
+echo "==========================================================="
+echo ""
+
+# Check if sqlite3 is available
+if ! command -v sqlite3 &> /dev/null; then
+    echo "sqlite3 not found. Installing..."
+    apk add sqlite 2>/dev/null || apt-get update && apt-get install -y sqlite3
+fi
+
+# Check if database exists
+if [ ! -f "$DB_PATH" ]; then
+    echo "Database not found at $DB_PATH"
+    echo "Trying alternative paths..."
+    
+    if [ -f "/pb_data/data.db" ]; then
+        DB_PATH="/pb_data/data.db"
+    elif [ -f "/pb/pb_data/data.db" ]; then
+        DB_PATH="/pb/pb_data/data.db"
+    else
+        DB_PATH=$(find / -name "data.db" 2>/dev/null | head -1)
+    fi
+    
+    if [ -z "$DB_PATH" ] || [ ! -f "$DB_PATH" ]; then
+        echo "Could not find PocketBase database!"
+        exit 1
+    fi
+fi
+
+echo "Database: $DB_PATH"
+echo ""
+
+# List tables
+echo "Tables in database:"
+sqlite3 "$DB_PATH" ".tables"
+echo ""
+
+# Find the telemetry table (usually matches collection name)
+echo "Looking for telemetry/installations table..."
+TABLE_NAME=$(sqlite3 "$DB_PATH" ".tables" | tr ' ' '\n' | grep -E "telemetry|installations" | head -1)
+
+if [ -z "$TABLE_NAME" ]; then
+    echo "Could not auto-detect table. Available tables:"
+    sqlite3 "$DB_PATH" ".tables"
+    echo ""
+    read -p "Enter table name: " TABLE_NAME
+fi
+
+echo "Using table: $TABLE_NAME"
+echo ""
+
+# Check if old_created column exists
+HAS_OLD_CREATED=$(sqlite3 "$DB_PATH" "PRAGMA table_info($TABLE_NAME);" | grep -c "old_created" || echo "0")
+
+if [ "$HAS_OLD_CREATED" -eq "0" ]; then
+    echo "Column 'old_created' not found in table $TABLE_NAME"
+    echo "Migration may not have been run with timestamp preservation."
+    exit 1
+fi
+
+# Show sample data before update
+echo "Sample data BEFORE update:"
+sqlite3 "$DB_PATH" "SELECT id, created, old_created FROM $TABLE_NAME WHERE old_created IS NOT NULL AND old_created != '' LIMIT 3;"
+echo ""
+
+# Count records to update
+COUNT=$(sqlite3 "$DB_PATH" "SELECT COUNT(*) FROM $TABLE_NAME WHERE old_created IS NOT NULL AND old_created != '';")
+echo "Records to update: $COUNT"
+echo ""
+
+read -p "Proceed with timestamp update? [y/N] " -n 1 -r
+echo ""
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    echo "Aborted."
+    exit 0
+fi
+
+# Perform the update
+echo "Updating timestamps..."
+sqlite3 "$DB_PATH" "UPDATE $TABLE_NAME SET created = old_created, updated = old_created WHERE old_created IS NOT NULL AND old_created != '';"
+
+# Show sample data after update
+echo ""
+echo "Sample data AFTER update:"
+sqlite3 "$DB_PATH" "SELECT id, created, old_created FROM $TABLE_NAME LIMIT 3;"
+echo ""
+
+echo "==========================================================="
+echo "   Timestamp Update Complete!"
+echo "==========================================================="
+echo ""
+echo "Next steps:"
+echo "1. Verify data in PocketBase Admin UI"
+echo "2. Remove the 'old_created' field from the collection schema"
+echo ""
diff --git a/misc/data/migration/import-direct.sh b/misc/data/migration/import-direct.sh
new file mode 100644
index 000000000..638548382
--- /dev/null
+++ b/misc/data/migration/import-direct.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+# Direct SQLite Import - Pure Shell, FAST batch mode!
+# Imports MongoDB Extended JSON directly into PocketBase SQLite
+#
+# Usage:
+#   docker cp import-direct.sh pocketbase:/tmp/
+#   docker cp data.json pocketbase:/tmp/
+#   docker exec -it pocketbase sh -c "cd /tmp && chmod +x import-direct.sh && ./import-direct.sh"
+
+set -e
+
+JSON_FILE="${1:-/tmp/data.json}"
+TABLE="${2:-telemetry}"
+REPO="${3:-Proxmox VE}"
+DB="${4:-/app/pb_data/data.db}"
+BATCH=5000
+
+echo "========================================================="
+echo "     Direct SQLite Import (Batch Mode)"
+echo "========================================================="
+echo "JSON:  $JSON_FILE"
+echo "Table: $TABLE"
+echo "Repo:  $REPO"
+echo "Batch: $BATCH"
+echo "---------------------------------------------------------"
+
+# Install jq if missing
+command -v jq >/dev/null || apk add --no-cache jq
+
+# Optimize SQLite for bulk
+sqlite3 "$DB" "PRAGMA journal_mode=WAL; PRAGMA synchronous=OFF; PRAGMA cache_size=100000;"
+
+SQL_FILE="/tmp/batch.sql"
+echo "[INFO] Converting JSON to SQL..."
+START=$(date +%s)
+
+# Convert entire JSON to SQL file (much faster than line-by-line sqlite3 calls)
+{
+    echo "BEGIN TRANSACTION;"
+    jq -r '.[] | @json' "$JSON_FILE" | while read -r r; do
+        CT=$(echo "$r" | jq -r 'if .ct_type|type=="object" then .ct_type["$numberLong"] else .ct_type end // 0')
+        DISK=$(echo "$r" | jq -r 'if .disk_size|type=="object" then .disk_size["$numberLong"] else .disk_size end // 0')
+        CORE=$(echo "$r" | jq -r 'if .core_count|type=="object" then .core_count["$numberLong"] else .core_count end // 0')
+        RAM=$(echo "$r" | jq -r 'if .ram_size|type=="object" then .ram_size["$numberLong"] else .ram_size end // 0')
+        OS=$(echo "$r" | jq -r '.os_type // ""' | sed "s/'/''/g")
+        OSVER=$(echo "$r" | jq -r '.os_version // ""' | sed "s/'/''/g")
+        DIS6=$(echo "$r" | jq -r '.disable_ip6 // "no"' | sed "s/'/''/g")
+        APP=$(echo "$r" | jq -r '.nsapp // "unknown"' | sed "s/'/''/g")
+        METH=$(echo "$r" | jq -r '.method // ""' | sed "s/'/''/g")
+        PVE=$(echo "$r" | jq -r '.pveversion // ""' | sed "s/'/''/g")
+        STAT=$(echo "$r" | jq -r '.status // "unknown"')
+        [ "$STAT" = "done" ] && STAT="success"
+        RID=$(echo "$r" | jq -r '.random_id // ""' | sed "s/'/''/g")
+        TYPE=$(echo "$r" | jq -r '.type // "lxc"' | sed "s/'/''/g")
+        ERR=$(echo "$r" | jq -r '.error // ""' | sed "s/'/''/g")
+        DATE=$(echo "$r" | jq -r 'if .created_at|type=="object" then .created_at["$date"] else .created_at end // ""')
+        ID=$(head -c 100 /dev/urandom | tr -dc 'a-z0-9' | head -c 15)
+        REPO_ESC=$(echo "$REPO" | sed "s/'/''/g")
+
+        echo "INSERT OR IGNORE INTO $TABLE (id,created,updated,ct_type,disk_size,core_count,ram_size,os_type,os_version,disableip6,nsapp,method,pve_version,status,random_id,type,error,repo_source) VALUES ('$ID','$DATE','$DATE',$CT,$DISK,$CORE,$RAM,'$OS','$OSVER','$DIS6','$APP','$METH','$PVE','$STAT','$RID','$TYPE','$ERR','$REPO_ESC');"
+    done
+    echo "COMMIT;"
+} > "$SQL_FILE"
+
+MID=$(date +%s)
+echo "[INFO] SQL generated in $((MID - START))s"
+echo "[INFO] Importing into SQLite..."
+
+sqlite3 "$DB" < "$SQL_FILE"
+
+END=$(date +%s)
+COUNT=$(wc -l < "$SQL_FILE")
+rm -f "$SQL_FILE"
+
+echo "========================================================="
+echo "Done! ~$((COUNT - 2)) records in $((END - START)) seconds"
+echo "========================================================="
diff --git a/misc/data/migration/migrate-linux.sh b/misc/data/migration/migrate-linux.sh
new file mode 100644
index 000000000..17b39eba7
--- /dev/null
+++ b/misc/data/migration/migrate-linux.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+# Migration script for Proxmox VE data
+# Run directly on the server machine
+#
+# Usage: ./migrate-linux.sh
+#
+# Prerequisites:
+# - Go installed (apt install golang-go)
+# - Network access to source API and PocketBase
+
+set -e
+
+echo "==========================================================="
+echo "   Proxmox VE Data Migration to PocketBase"
+echo "==========================================================="
+
+# Configuration - EDIT THESE VALUES
+export MIGRATION_SOURCE_URL="https://api.htl-braunau.at/data"
+export POCKETBASE_URL="http://db.community-scripts.org"
+export POCKETBASE_COLLECTION="telemetry"
+export PB_AUTH_COLLECTION="_superusers"
+export PB_IDENTITY="db_admin@community-scripts.org"
+export PB_PASSWORD="YOUR_PASSWORD_HERE"  # <-- CHANGE THIS!
+export REPO_SOURCE="Proxmox VE"
+export DATE_UNTIL="2026-02-10"
+export BATCH_SIZE="500"
+
+# Optional: Resume from specific page
+# export START_PAGE="100"
+
+# Optional: Only import records after this date
+# export DATE_FROM="2020-01-01"
+
+echo ""
+echo "Configuration:"
+echo "  Source:     $MIGRATION_SOURCE_URL"
+echo "  Target:     $POCKETBASE_URL"
+echo "  Collection: $POCKETBASE_COLLECTION"
+echo "  Repo:       $REPO_SOURCE"
+echo "  Until:      $DATE_UNTIL"
+echo "  Batch:      $BATCH_SIZE"
+echo ""
+
+# Check if Go is installed
+if ! command -v go &> /dev/null; then
+    echo "Go is not installed. Installing..."
+    apt-get update && apt-get install -y golang-go
+fi
+
+# Download migrate.go if not present
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+MIGRATE_GO="$SCRIPT_DIR/migrate.go"
+
+if [ ! -f "$MIGRATE_GO" ]; then
+    echo "migrate.go not found in $SCRIPT_DIR"
+    echo "Please copy migrate.go to this directory first."
+    exit 1
+fi
+
+echo "Building migration tool..."
+cd "$SCRIPT_DIR"
+go build -o migrate migrate.go
+
+echo ""
+echo "Starting migration..."
+echo "Press Ctrl+C to stop (you can resume later with START_PAGE)"
+echo ""
+
+./migrate
+
+echo ""
+echo "==========================================================="
+echo "   Post-Migration Steps"
+echo "==========================================================="
+echo ""
+echo "1. Connect to PocketBase container:"
+echo "   docker exec -it <pocketbase-container> sh"
+echo ""
+echo "2. Find the table name:"
+echo "   sqlite3 /app/pb_data/data.db '.tables'"
+echo ""
+echo "3. Update timestamps (replace <table> with actual name):"
+echo "   sqlite3 /app/pb_data/data.db \"UPDATE <table> SET created = old_created, updated = old_created WHERE old_created IS NOT NULL AND old_created != ''\""
+echo ""
+echo "4. Verify timestamps:"
+echo "   sqlite3 /app/pb_data/data.db \"SELECT created, old_created FROM <table> LIMIT 5\""
+echo ""
+echo "5. Remove old_created field in PocketBase Admin UI"
+echo ""
diff --git a/misc/data/migration/migrate.go b/misc/data/migration/migrate.go
new file mode 100644
index 000000000..157d622f6
--- /dev/null
+++ b/misc/data/migration/migrate.go
@@ -0,0 +1,1295 @@
+// +build ignore
+
+// Migration script to import data from the old API or JSON file to PocketBase
+// Run with: go run migrate.go
+//
+// Environment variables:
+//   JSON_FILE             - Path to JSON file to import (if set, skips API fetch)
+//   SQL_OUTPUT            - Path to output SQL file (direct SQLite import, fastest!)
+//   MIGRATION_SOURCE_URL  - Base URL of source API (default: https://api.htl-braunau.at/data)
+//   POCKETBASE_URL        - PocketBase URL (default: http://localhost:8090)
+//   POCKETBASE_COLLECTION - Target collection (default: telemetry)
+//   PB_IDENTITY           - Auth username
+//   PB_PASSWORD           - Auth password
+//   REPO_SOURCE           - Value for repo_source field (e.g., "community-scripts" or "Proxmox VE")
+//   DATE_UNTIL            - Only import records created before this date (format: YYYY-MM-DD)
+//   DATE_FROM             - Only import records created after this date (format: YYYY-MM-DD)
+//   START_PAGE            - Resume from this page (default: 1, API mode only)
+//   BATCH_SIZE            - Records per batch (default: 500)
+//   SKIP_RECORDS          - Skip first N records (JSON file mode, for resuming)
+//   WORKERS               - Number of parallel HTTP workers (default: 50)
+//
+// SQL Output Mode (fastest - seconds for millions of records):
+//   $env:JSON_FILE = "data.json"
+//   $env:SQL_OUTPUT = "import.sql"
+//   $env:REPO_SOURCE = "Proxmox VE"
+//   .\migrate.exe
+//   # Then on server: sqlite3 /app/pb_data/data.db < import.sql
+//
+// JSON file format (array of objects):
+//   [{"id": "...", "ct_type": 1, "nsapp": "...", ...}, ...]
+package main
+
+import (
+	"bufio"
+	"bytes"
+	cryptoRand "crypto/rand"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+const (
+	defaultSourceAPI = "https://api.htl-braunau.at/data"
+	defaultPBURL     = "http://localhost:8090"
+	defaultBatchSize = 500
+	defaultWorkers   = 50 // Parallel workers for importing
+)
+
+var (
+	sourceAPI      string
+	summaryAPI     string
+	authToken      string
+	repoSource     string
+	dateUntil      time.Time
+	dateFrom       time.Time
+	hasDateUntil   bool
+	hasDateFrom    bool
+	workerCount    int = defaultWorkers
+)
+
+// OldDataModel represents the data structure from the old API
+type OldDataModel struct {
+	ID         string `json:"id"`
+	CtType     int    `json:"ct_type"`
+	DiskSize   int    `json:"disk_size"`
+	CoreCount  int    `json:"core_count"`
+	RamSize    int    `json:"ram_size"`
+	OsType     string `json:"os_type"`
+	OsVersion  string `json:"os_version"`
+	DisableIP6 string `json:"disableip6"`
+	NsApp      string `json:"nsapp"`
+	Method     string `json:"method"`
+	CreatedAt  string `json:"created_at"`
+	PveVersion string `json:"pve_version"`
+	Status     string `json:"status"`
+	RandomID   string `json:"random_id"`
+	Type       string `json:"type"`
+	Error      string `json:"error"`
+} 
+
+// MongoNumberLong represents MongoDB's $numberLong type
+type MongoNumberLong struct {
+	Value string `json:"$numberLong"`
+}
+
+// MongoDate represents MongoDB's $date type
+type MongoDate struct {
+	Value string `json:"$date"`
+}
+
+// MongoOID represents MongoDB's $oid type
+type MongoOID struct {
+	Value string `json:"$oid"`
+}
+
+// MongoDataModel represents MongoDB Extended JSON export format
+type MongoDataModel struct {
+	MongoID    MongoOID        `json:"_id"`
+	ID         json.RawMessage `json:"id"`
+	CtType     json.RawMessage `json:"ct_type"`
+	DiskSize   json.RawMessage `json:"disk_size"`
+	CoreCount  json.RawMessage `json:"core_count"`
+	RamSize    json.RawMessage `json:"ram_size"`
+	OsType     string          `json:"os_type"`
+	OsVersion  string          `json:"os_version"`
+	DisableIP6 string          `json:"disable_ip6"`
+	NsApp      string          `json:"nsapp"`
+	Method     string          `json:"method"`
+	CreatedAt  json.RawMessage `json:"created_at"`
+	PveVersion string          `json:"pveversion"`
+	Status     string          `json:"status"`
+	RandomID   string          `json:"random_id"`
+	Type       string          `json:"type"`
+	Error      *string         `json:"error"`
+}
+
+// parseMongoInt extracts int from MongoDB $numberLong or plain number
+func parseMongoInt(raw json.RawMessage) int {
+	if len(raw) == 0 {
+		return 0
+	}
+	// Try $numberLong first
+	var numLong MongoNumberLong
+	if err := json.Unmarshal(raw, &numLong); err == nil && numLong.Value != "" {
+		if n, err := strconv.Atoi(numLong.Value); err == nil {
+			return n
+		}
+	}
+	// Try plain number
+	var n int
+	if err := json.Unmarshal(raw, &n); err == nil {
+		return n
+	}
+	return 0
+}
+
+// parseMongoDate extracts date string from MongoDB $date or plain string
+func parseMongoDate(raw json.RawMessage) string {
+	if len(raw) == 0 {
+		return ""
+	}
+	// Try $date first
+	var mongoDate MongoDate
+	if err := json.Unmarshal(raw, &mongoDate); err == nil && mongoDate.Value != "" {
+		return mongoDate.Value
+	}
+	// Try plain string
+	var s string
+	if err := json.Unmarshal(raw, &s); err == nil {
+		return s
+	}
+	return ""
+}
+
+// parseMongoString extracts string from MongoDB $numberLong or plain string/number
+func parseMongoString(raw json.RawMessage) string {
+	if len(raw) == 0 {
+		return ""
+	}
+	// Try $numberLong first (MongoDB exports IDs as numbers sometimes)
+	var numLong MongoNumberLong
+	if err := json.Unmarshal(raw, &numLong); err == nil && numLong.Value != "" {
+		return numLong.Value
+	}
+	// Try plain string
+	var s string
+	if err := json.Unmarshal(raw, &s); err == nil {
+		return s
+	}
+	// Try plain number
+	var n int64
+	if err := json.Unmarshal(raw, &n); err == nil {
+		return strconv.FormatInt(n, 10)
+	}
+	return ""
+}
+
+// convertMongoToOld converts MongoDB format to OldDataModel
+func convertMongoToOld(m MongoDataModel) OldDataModel {
+	errorStr := ""
+	if m.Error != nil {
+		errorStr = *m.Error
+	}
+	return OldDataModel{
+		CtType:     parseMongoInt(m.CtType),
+		DiskSize:   parseMongoInt(m.DiskSize),
+		CoreCount:  parseMongoInt(m.CoreCount),
+		RamSize:    parseMongoInt(m.RamSize),
+		OsType:     m.OsType,
+		OsVersion:  m.OsVersion,
+		DisableIP6: m.DisableIP6,
+		NsApp:      m.NsApp,
+		Method:     m.Method,
+		CreatedAt:  parseMongoDate(m.CreatedAt),
+		PveVersion: m.PveVersion,
+		Status:     m.Status,
+		RandomID:   m.RandomID,
+		Type:       m.Type,
+		Error:      errorStr,
+	}
+}
+
+// PBRecord represents the PocketBase record format
+type PBRecord struct {
+	CtType     int    `json:"ct_type"`
+	DiskSize   int    `json:"disk_size"`
+	CoreCount  int    `json:"core_count"`
+	RamSize    int    `json:"ram_size"`
+	OsType     string `json:"os_type"`
+	OsVersion  string `json:"os_version"`
+	DisableIP6 string `json:"disableip6"`
+	NsApp      string `json:"nsapp"`
+	Method     string `json:"method"`
+	PveVersion string `json:"pve_version"`
+	Status     string `json:"status"`
+	RandomID   string `json:"random_id"`
+	Type       string `json:"type"`
+	Error      string `json:"error"`
+	RepoSource string `json:"repo_source,omitempty"`
+	OldCreated string `json:"old_created,omitempty"`
+}
+
+type Summary struct {
+	TotalEntries int `json:"total_entries"`
+}
+
+type ImportJob struct {
+	Record OldDataModel
+	Index  int
+}
+
+type ImportResult struct {
+	Success bool
+	Skipped bool
+	Error   error
+}
+
+func main() {
+	// Setup source URLs
+	baseURL := os.Getenv("MIGRATION_SOURCE_URL")
+	if baseURL == "" {
+		baseURL = defaultSourceAPI
+	}
+	sourceAPI = baseURL + "/paginated"
+	summaryAPI = baseURL + "/summary"
+
+	// Repo source (to distinguish data origins)
+	repoSource = os.Getenv("REPO_SOURCE")
+
+	// Date filters
+	if dateStr := os.Getenv("DATE_UNTIL"); dateStr != "" {
+		parsed, err := time.Parse("2006-01-02", dateStr)
+		if err != nil {
+			fmt.Printf("[ERROR] Invalid DATE_UNTIL format (use YYYY-MM-DD): %v\n", err)
+			os.Exit(1)
+		}
+		dateUntil = parsed.Add(24*time.Hour - time.Second) // End of day
+		hasDateUntil = true
+	}
+
+	if dateStr := os.Getenv("DATE_FROM"); dateStr != "" {
+		parsed, err := time.Parse("2006-01-02", dateStr)
+		if err != nil {
+			fmt.Printf("[ERROR] Invalid DATE_FROM format (use YYYY-MM-DD): %v\n", err)
+			os.Exit(1)
+		}
+		dateFrom = parsed // Start of day
+		hasDateFrom = true
+	}
+
+	// Batch size
+	batchSize := defaultBatchSize
+	if bs := os.Getenv("BATCH_SIZE"); bs != "" {
+		if n, err := strconv.Atoi(bs); err == nil && n > 0 {
+			batchSize = n
+		}
+	}
+
+	// Start page (for resuming)
+	startPage := 1
+	if sp := os.Getenv("START_PAGE"); sp != "" {
+		if n, err := strconv.Atoi(sp); err == nil && n > 0 {
+			startPage = n
+		}
+	}
+
+	// PocketBase URL
+	pbURL := os.Getenv("POCKETBASE_URL")
+	if pbURL == "" {
+		pbURL = os.Getenv("PB_URL")
+	}
+	if pbURL == "" {
+		pbURL = defaultPBURL
+	}
+
+	// Collection
+	pbCollection := os.Getenv("POCKETBASE_COLLECTION")
+	if pbCollection == "" {
+		pbCollection = os.Getenv("PB_TARGET_COLLECTION")
+	}
+	if pbCollection == "" {
+		pbCollection = "telemetry"
+	}
+
+	// Auth collection
+	authCollection := os.Getenv("PB_AUTH_COLLECTION")
+	if authCollection == "" {
+		authCollection = "telemetry_service_user"
+	}
+
+	// Credentials
+	pbIdentity := os.Getenv("PB_IDENTITY")
+	pbPassword := os.Getenv("PB_PASSWORD")
+
+	// Workers count
+	if wc := os.Getenv("WORKERS"); wc != "" {
+		if n, err := strconv.Atoi(wc); err == nil && n > 0 {
+			workerCount = n
+		}
+	}
+
+	// Check for SQL output mode (fastest - no network!)
+	jsonFile := os.Getenv("JSON_FILE")
+	sqlOutput := os.Getenv("SQL_OUTPUT")
+	if jsonFile != "" && sqlOutput != "" {
+		runSQLExport(jsonFile, sqlOutput, pbCollection)
+		return
+	}
+
+	// Check for JSON file import mode (via HTTP API)
+	if jsonFile != "" {
+		// Authenticate first
+		if pbIdentity != "" && pbPassword != "" {
+			fmt.Println("[AUTH] Authenticating with PocketBase...")
+			err := authenticate(pbURL, authCollection, pbIdentity, pbPassword)
+			if err != nil {
+				fmt.Printf("[ERROR] Authentication failed: %v\n", err)
+				os.Exit(1)
+			}
+			fmt.Println("[OK] Authentication successful")
+		}
+
+		// Skip records (for resuming)
+		var skipRecords int64
+		if sr := os.Getenv("SKIP_RECORDS"); sr != "" {
+			if n, err := strconv.ParseInt(sr, 10, 64); err == nil && n > 0 {
+				skipRecords = n
+			}
+		}
+
+		runJSONFileImport(jsonFile, pbURL, pbCollection, batchSize, skipRecords)
+		return
+	}
+
+	fmt.Println("=========================================================")
+	fmt.Println("        Data Migration to PocketBase")
+	fmt.Println("=========================================================")
+	fmt.Printf("Source API:       %s\n", baseURL)
+	fmt.Printf("PocketBase URL:   %s\n", pbURL)
+	fmt.Printf("Collection:       %s\n", pbCollection)
+	fmt.Printf("Batch Size:       %d\n", batchSize)
+	fmt.Printf("Workers:          %d\n", workerCount)
+	if repoSource != "" {
+		fmt.Printf("Repo Source:      %s\n", repoSource)
+	}
+	if hasDateFrom {
+		fmt.Printf("Date From:        >= %s\n", dateFrom.Format("2006-01-02"))
+	}
+	if hasDateUntil {
+		fmt.Printf("Date Until:       <= %s\n", dateUntil.Format("2006-01-02"))
+	}
+	if startPage > 1 {
+		fmt.Printf("Starting Page:    %d\n", startPage)
+	}
+	fmt.Println("---------------------------------------------------------")
+
+	// Authenticate with PocketBase
+	if pbIdentity != "" && pbPassword != "" {
+		fmt.Println("[AUTH] Authenticating with PocketBase...")
+		err := authenticate(pbURL, authCollection, pbIdentity, pbPassword)
+		if err != nil {
+			fmt.Printf("[ERROR] Authentication failed: %v\n", err)
+			os.Exit(1)
+		}
+		fmt.Println("[OK] Authentication successful")
+	} else {
+		fmt.Println("[WARN] No credentials provided, trying without auth...")
+	}
+	fmt.Println("---------------------------------------------------------")
+
+	// Get total count
+	summary, err := getSummary()
+	if err != nil {
+		fmt.Printf("[ERROR] Failed to get summary: %v\n", err)
+		os.Exit(1)
+	}
+	fmt.Printf("[INFO] Total entries in source: %d\n", summary.TotalEntries)
+	fmt.Println("---------------------------------------------------------")
+
+	// Calculate pages
+	totalPages := (summary.TotalEntries + batchSize - 1) / batchSize
+
+	fmt.Printf("Starting migration (%d pages to process)...\n", totalPages)
+	fmt.Println()
+
+	var totalMigrated, totalFailed, totalSkipped, totalFiltered int64
+	startTime := time.Now()
+
+	// Progress tracking
+	processedRecords := int64(0)
+
+	for page := startPage; page <= totalPages; page++ {
+		pageStart := time.Now()
+
+		data, err := fetchPage(page, batchSize)
+		if err != nil {
+			fmt.Printf("[Page %d] ERROR: Failed to fetch: %v\n", page, err)
+			atomic.AddInt64(&totalFailed, int64(batchSize))
+			continue
+		}
+
+		// Filter by date if needed
+		var filteredData []OldDataModel
+		var lastTimestamp string
+		pageFiltered := 0
+
+		for _, record := range data {
+			recordDate, err := parseTimestamp(record.CreatedAt)
+			if err != nil {
+				// Skip records with unparseable dates
+				atomic.AddInt64(&totalFiltered, 1)
+				pageFiltered++
+				continue
+			}
+
+			// Check DATE_FROM (skip if before)
+			if hasDateFrom && recordDate.Before(dateFrom) {
+				atomic.AddInt64(&totalFiltered, 1)
+				pageFiltered++
+				continue
+			}
+
+			// Check DATE_UNTIL (skip if after)
+			if hasDateUntil && recordDate.After(dateUntil) {
+				atomic.AddInt64(&totalFiltered, 1)
+				pageFiltered++
+				continue
+			}
+
+			filteredData = append(filteredData, record)
+			lastTimestamp = record.CreatedAt
+		}
+
+		atomic.AddInt64(&processedRecords, int64(len(data)))
+
+		// Show progress even if all filtered
+		if len(filteredData) == 0 {
+			if page <= 5 || page%100 == 0 {
+				fmt.Printf("[Page %d/%d] All %d filtered (after DATE_UNTIL) | Total filtered: %d\n",
+					page, totalPages, pageFiltered, atomic.LoadInt64(&totalFiltered))
+			}
+			continue
+		}
+
+		// Worker pool for importing
+		jobs := make(chan ImportJob, len(filteredData))
+		results := make(chan ImportResult, len(filteredData))
+		var wg sync.WaitGroup
+
+		// Start workers
+		for w := 0; w < workerCount; w++ {
+			wg.Add(1)
+			go func() {
+				defer wg.Done()
+				for job := range jobs {
+					result := importRecordWithRetry(pbURL, pbCollection, job.Record, 3)
+					results <- result
+				}
+			}()
+		}
+
+		// Send jobs
+		for i, record := range filteredData {
+			jobs <- ImportJob{Record: record, Index: i}
+		}
+		close(jobs)
+
+		// Wait for workers to finish
+		go func() {
+			wg.Wait()
+			close(results)
+		}()
+
+		// Collect results
+		pageMigrated, pageSkipped, pageFailed := 0, 0, 0
+		var lastError error
+		for result := range results {
+			if result.Skipped {
+				pageSkipped++
+			} else if result.Success {
+				pageMigrated++
+			} else {
+				pageFailed++
+				if lastError == nil && result.Error != nil {
+					lastError = result.Error
+				}
+			}
+		}
+
+		// Log first error on the page
+		if pageFailed > 0 && lastError != nil && page <= 3 {
+			fmt.Printf("[Page %d] Sample error: %v\n", page, lastError)
+		}
+
+		atomic.AddInt64(&totalMigrated, int64(pageMigrated))
+		atomic.AddInt64(&totalSkipped, int64(pageSkipped))
+		atomic.AddInt64(&totalFailed, int64(pageFailed))
+
+		// Progress display (first 5 pages, then every 10 pages)
+		if page <= 5 || page%10 == 0 || page == totalPages {
+			elapsed := time.Since(startTime)
+			processed := atomic.LoadInt64(&processedRecords)
+			rate := float64(processed) / elapsed.Seconds()
+			remaining := float64(summary.TotalEntries-int(processed)) / rate
+			eta := time.Duration(remaining) * time.Second
+
+			// Format last timestamp for display
+			lastDate := ""
+			if lastTimestamp != "" {
+				if t, err := parseTimestamp(lastTimestamp); err == nil {
+					lastDate = t.Format("2006-01-02")
+				}
+			}
+
+			fmt.Printf("[Page %d/%d] Migrated: %d | Skipped: %d | Failed: %d | Filtered: %d | %.0f rec/s | Last: %s | ETA: %s\n",
+				page, totalPages,
+				atomic.LoadInt64(&totalMigrated),
+				atomic.LoadInt64(&totalSkipped),
+				atomic.LoadInt64(&totalFailed),
+				atomic.LoadInt64(&totalFiltered),
+				rate,
+				lastDate,
+				formatDuration(eta))
+		}
+
+		// Adaptive delay based on page processing time
+		pageTime := time.Since(pageStart)
+		if pageTime < 500*time.Millisecond {
+			time.Sleep(100 * time.Millisecond)
+		}
+	}
+
+	fmt.Println()
+	fmt.Println("=========================================================")
+	fmt.Println("        Migration Complete")
+	fmt.Println("=========================================================")
+	fmt.Printf("Successfully migrated: %d\n", atomic.LoadInt64(&totalMigrated))
+	fmt.Printf("Skipped (duplicates):  %d\n", atomic.LoadInt64(&totalSkipped))
+	fmt.Printf("Filtered (date):       %d\n", atomic.LoadInt64(&totalFiltered))
+	fmt.Printf("Failed:                %d\n", atomic.LoadInt64(&totalFailed))
+	fmt.Printf("Duration:              %s\n", formatDuration(time.Since(startTime)))
+	fmt.Println("=========================================================")
+
+	if atomic.LoadInt64(&totalMigrated) > 0 {
+		fmt.Println()
+		fmt.Println("Next steps for timestamp migration:")
+		fmt.Printf("   1. SSH into your PocketBase server\n")
+		fmt.Printf("   2. Run: sqlite3 /app/pb_data/data.db \".tables\"\n")
+		fmt.Printf("   3. Find your collection table name\n")
+		fmt.Printf("   4. Run: sqlite3 /app/pb_data/data.db \"UPDATE <table_name> SET created = old_created, updated = old_created WHERE old_created IS NOT NULL AND old_created != ''\"\n")
+		fmt.Printf("   5. Remove the old_created field from the collection in PocketBase Admin UI\n")
+	}
+}
+
+func formatDuration(d time.Duration) string {
+	if d < 0 {
+		return "calculating..."
+	}
+	h := d / time.Hour
+	d -= h * time.Hour
+	m := d / time.Minute
+	d -= m * time.Minute
+	s := d / time.Second
+	if h > 0 {
+		return fmt.Sprintf("%dh %dm %ds", h, m, s)
+	}
+	if m > 0 {
+		return fmt.Sprintf("%dm %ds", m, s)
+	}
+	return fmt.Sprintf("%ds", s)
+}
+
+func parseTimestamp(ts string) (time.Time, error) {
+	if ts == "" {
+		return time.Time{}, fmt.Errorf("empty timestamp")
+	}
+
+	formats := []string{
+		time.RFC3339,
+		time.RFC3339Nano,
+		"2006-01-02T15:04:05.000Z",
+		"2006-01-02T15:04:05Z",
+		"2006-01-02T15:04:05",
+		"2006-01-02 15:04:05",
+		"2006-01-02 15:04:05.000",
+		"2006-01-02 15:04:05.000 UTC",
+		"2006-01-02T15:04:05.000+00:00",
+	}
+
+	for _, format := range formats {
+		if t, err := time.Parse(format, ts); err == nil {
+			return t, nil
+		}
+	}
+
+	return time.Time{}, fmt.Errorf("cannot parse: %s", ts)
+}
+
+func convertTimestamp(ts string) string {
+	if ts == "" {
+		return ""
+	}
+
+	t, err := parseTimestamp(ts)
+	if err != nil {
+		return ""
+	}
+
+	return t.UTC().Format("2006-01-02 15:04:05.000Z")
+}
+
+func getSummary() (*Summary, error) {
+	resp, err := http.Get(summaryAPI)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	var summary Summary
+	if err := json.NewDecoder(resp.Body).Decode(&summary); err != nil {
+		return nil, err
+	}
+
+	return &summary, nil
+}
+
+func authenticate(pbURL, authCollection, identity, password string) error {
+	body := map[string]string{
+		"identity": identity,
+		"password": password,
+	}
+	jsonData, _ := json.Marshal(body)
+
+	url := fmt.Sprintf("%s/api/collections/%s/auth-with-password", pbURL, authCollection)
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	client := &http.Client{Timeout: 10 * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		body, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(body))
+	}
+
+	var result struct {
+		Token string `json:"token"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return err
+	}
+	if result.Token == "" {
+		return fmt.Errorf("no token in response")
+	}
+
+	authToken = result.Token
+	return nil
+}
+
+func fetchPage(page, limit int) ([]OldDataModel, error) {
+	url := fmt.Sprintf("%s?page=%d&limit=%d", sourceAPI, page, limit)
+
+	client := &http.Client{Timeout: 60 * time.Second}
+	resp, err := client.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(resp.Body)
+		return nil, fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(body))
+	}
+
+	var data []OldDataModel
+	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
+		return nil, err
+	}
+
+	return data, nil
+}
+
+func importRecordWithRetry(pbURL, collection string, old OldDataModel, maxRetries int) ImportResult {
+	var lastErr error
+	for i := 0; i < maxRetries; i++ {
+		err := importRecord(pbURL, collection, old)
+		if err == nil {
+			return ImportResult{Success: true}
+		}
+		if isUniqueViolation(err) {
+			return ImportResult{Skipped: true}
+		}
+		lastErr = err
+		time.Sleep(time.Duration(i+1) * 100 * time.Millisecond)
+	}
+	return ImportResult{Error: lastErr}
+}
+
+func importRecord(pbURL, collection string, old OldDataModel) error {
+	// Map status: "done" -> "success"
+	status := old.Status
+	switch status {
+	case "done":
+		status = "success"
+	case "installing", "failed", "unknown", "success":
+		// keep as-is
+	default:
+		status = "unknown"
+	}
+
+	// Map ct_type: 1=unprivileged (0), 2=privileged (1)
+	// PocketBase schema: 0 = unprivileged, 1 = privileged
+	ctType := 0 // default: unprivileged
+	if old.CtType == 2 {
+		ctType = 1 // privileged
+	}
+
+	// Ensure type is set
+	recordType := old.Type
+	if recordType == "" {
+		recordType = "lxc"
+	}
+
+	// Ensure nsapp is set (required field)
+	nsapp := old.NsApp
+	if nsapp == "" {
+		nsapp = "unknown"
+	}
+
+	record := PBRecord{
+		CtType:     ctType,
+		DiskSize:   old.DiskSize,
+		CoreCount:  old.CoreCount,
+		RamSize:    old.RamSize,
+		OsType:     old.OsType,
+		OsVersion:  old.OsVersion,
+		DisableIP6: old.DisableIP6,
+		NsApp:      nsapp,
+		Method:     old.Method,
+		PveVersion: old.PveVersion,
+		Status:     status,
+		RandomID:   old.RandomID,
+		Type:       recordType,
+		Error:      old.Error,
+		RepoSource: repoSource,
+		OldCreated: convertTimestamp(old.CreatedAt),
+	}
+
+	jsonData, err := json.Marshal(record)
+	if err != nil {
+		return err
+	}
+
+	url := fmt.Sprintf("%s/api/collections/%s/records", pbURL, collection)
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonData))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	if authToken != "" {
+		req.Header.Set("Authorization", "Bearer "+authToken)
+	}
+
+	client := &http.Client{Timeout: 10 * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
+		body, _ := io.ReadAll(resp.Body)
+		return fmt.Errorf("HTTP %d: %s", resp.StatusCode, string(body))
+	}
+
+	return nil
+}
+
+func isUniqueViolation(err error) bool {
+	if err == nil {
+		return false
+	}
+	errStr := err.Error()
+	return strings.Contains(errStr, "UNIQUE constraint failed") ||
+		strings.Contains(errStr, "duplicate") ||
+		strings.Contains(errStr, "already exists") ||
+		strings.Contains(errStr, "validation_not_unique")
+}
+
+// runJSONFileImport handles importing from a JSON file using streaming
+func runJSONFileImport(jsonFile, pbURL, pbCollection string, batchSize int, skipRecords int64) {
+	fmt.Println("=========================================================")
+	fmt.Println("        JSON File Import to PocketBase")
+	fmt.Println("=========================================================")
+	fmt.Printf("JSON File:        %s\n", jsonFile)
+	fmt.Printf("PocketBase URL:   %s\n", pbURL)
+	fmt.Printf("Collection:       %s\n", pbCollection)
+	fmt.Printf("Batch Size:       %d\n", batchSize)
+	fmt.Printf("Workers:          %d\n", workerCount)
+	if repoSource != "" {
+		fmt.Printf("Repo Source:      %s\n", repoSource)
+	}
+	if hasDateFrom {
+		fmt.Printf("Date From:        >= %s\n", dateFrom.Format("2006-01-02"))
+	}
+	if hasDateUntil {
+		fmt.Printf("Date Until:       <= %s\n", dateUntil.Format("2006-01-02"))
+	}
+	if skipRecords > 0 {
+		fmt.Printf("Skip Records:     %d\n", skipRecords)
+	}
+	fmt.Println("---------------------------------------------------------")
+
+	// Open file
+	file, err := os.Open(jsonFile)
+	if err != nil {
+		fmt.Printf("[ERROR] Cannot open file: %v\n", err)
+		os.Exit(1)
+	}
+	defer file.Close()
+
+	// Get file size for progress
+	fileInfo, _ := file.Stat()
+	fileSize := fileInfo.Size()
+	fmt.Printf("[INFO] File size: %.2f GB\n", float64(fileSize)/(1024*1024*1024))
+
+	// Auto-detect MongoDB Extended JSON format by peeking at the first 2KB
+	peekBuf := make([]byte, 2048)
+	n, _ := file.Read(peekBuf)
+	peekStr := string(peekBuf[:n])
+	isMongoFormat := strings.Contains(peekStr, `"$oid"`) ||
+		strings.Contains(peekStr, `"$numberLong"`) ||
+		strings.Contains(peekStr, `"$date"`)
+
+	// Reset file to beginning
+	file.Seek(0, 0)
+
+	if isMongoFormat {
+		fmt.Println("[INFO] Detected MongoDB Extended JSON format")
+	} else {
+		fmt.Println("[INFO] Detected standard JSON format")
+	}
+
+	// Use buffered reader for better performance
+	reader := bufio.NewReaderSize(file, 64*1024*1024) // 64MB buffer
+
+	// Create JSON decoder for streaming
+	decoder := json.NewDecoder(reader)
+
+	// Expect array start
+	token, err := decoder.Token()
+	if err != nil {
+		fmt.Printf("[ERROR] Cannot read JSON: %v\n", err)
+		os.Exit(1)
+	}
+	if delim, ok := token.(json.Delim); !ok || delim != '[' {
+		fmt.Printf("[ERROR] JSON file must be an array (expected '[', got %v)\n", token)
+		os.Exit(1)
+	}
+
+	fmt.Println("[OK] JSON array detected, starting streaming import...")
+	fmt.Println("---------------------------------------------------------")
+
+	var totalMigrated, totalFailed, totalSkipped, totalFiltered int64
+	var recordCount int64
+	startTime := time.Now()
+
+	// Batch processing
+	batch := make([]OldDataModel, 0, batchSize)
+	batchNum := 0
+
+	for decoder.More() {
+		var record OldDataModel
+
+		if isMongoFormat {
+			// Decode as MongoDB Extended JSON
+			var mongoRecord MongoDataModel
+			if err := decoder.Decode(&mongoRecord); err != nil {
+				fmt.Printf("[WARN] Failed to decode record %d: %v\n", recordCount+1, err)
+				atomic.AddInt64(&totalFailed, 1)
+				recordCount++
+				continue
+			}
+			record = convertMongoToOld(mongoRecord)
+		} else {
+			// Decode as standard JSON
+			if err := decoder.Decode(&record); err != nil {
+				fmt.Printf("[WARN] Failed to decode record %d: %v\n", recordCount+1, err)
+				atomic.AddInt64(&totalFailed, 1)
+				recordCount++
+				continue
+			}
+		}
+		recordCount++
+
+		// Skip records (for resuming)
+		if recordCount <= skipRecords {
+			if recordCount%100000 == 0 {
+				fmt.Printf("[SKIP] Skipped %d / %d records...\n", recordCount, skipRecords)
+			}
+			continue
+		}
+
+		// Date filter
+		if hasDateFrom || hasDateUntil {
+			recordDate, err := parseTimestamp(record.CreatedAt)
+			if err != nil {
+				atomic.AddInt64(&totalFiltered, 1)
+				continue
+			}
+			if hasDateFrom && recordDate.Before(dateFrom) {
+				atomic.AddInt64(&totalFiltered, 1)
+				continue
+			}
+			if hasDateUntil && recordDate.After(dateUntil) {
+				atomic.AddInt64(&totalFiltered, 1)
+				continue
+			}
+		}
+
+		batch = append(batch, record)
+
+		// Process batch when full
+		if len(batch) >= batchSize {
+			batchNum++
+			migrated, skipped, failed := processBatch(pbURL, pbCollection, batch, batchNum, recordCount, startTime)
+			atomic.AddInt64(&totalMigrated, int64(migrated))
+			atomic.AddInt64(&totalSkipped, int64(skipped))
+			atomic.AddInt64(&totalFailed, int64(failed))
+			batch = batch[:0] // Reset batch
+		}
+	}
+
+	// Process remaining batch
+	if len(batch) > 0 {
+		batchNum++
+		migrated, skipped, failed := processBatch(pbURL, pbCollection, batch, batchNum, recordCount, startTime)
+		atomic.AddInt64(&totalMigrated, int64(migrated))
+		atomic.AddInt64(&totalSkipped, int64(skipped))
+		atomic.AddInt64(&totalFailed, int64(failed))
+	}
+
+	fmt.Println()
+	fmt.Println("=========================================================")
+	fmt.Println("        JSON File Import Complete")
+	fmt.Println("=========================================================")
+	fmt.Printf("Total records read:    %d\n", recordCount)
+	fmt.Printf("Successfully imported: %d\n", atomic.LoadInt64(&totalMigrated))
+	fmt.Printf("Skipped (duplicates):  %d\n", atomic.LoadInt64(&totalSkipped))
+	fmt.Printf("Filtered (date):       %d\n", atomic.LoadInt64(&totalFiltered))
+	fmt.Printf("Failed:                %d\n", atomic.LoadInt64(&totalFailed))
+	fmt.Printf("Duration:              %s\n", formatDuration(time.Since(startTime)))
+	fmt.Println("=========================================================")
+
+	if atomic.LoadInt64(&totalMigrated) > 0 {
+		fmt.Println()
+		fmt.Println("Next steps for timestamp migration:")
+		fmt.Printf("   1. SSH into your PocketBase server\n")
+		fmt.Printf("   2. Run: sqlite3 /app/pb_data/data.db \".tables\"\n")
+		fmt.Printf("   3. Find your collection table name\n")
+		fmt.Printf("   4. Run: sqlite3 /app/pb_data/data.db \"UPDATE <table_name> SET created = old_created, updated = old_created WHERE old_created IS NOT NULL AND old_created != ''\"\n")
+		fmt.Printf("   5. Remove the old_created field from the collection in PocketBase Admin UI\n")
+	}
+}
+
+func processBatch(pbURL, pbCollection string, records []OldDataModel, batchNum int, totalRead int64, startTime time.Time) (migrated, skipped, failed int) {
+	batchStart := time.Now()
+
+	// Worker pool
+	jobs := make(chan ImportJob, len(records))
+	results := make(chan ImportResult, len(records))
+	var wg sync.WaitGroup
+
+	// Start workers
+	for w := 0; w < workerCount; w++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for job := range jobs {
+				result := importRecordWithRetry(pbURL, pbCollection, job.Record, 3)
+				results <- result
+			}
+		}()
+	}
+
+	// Send jobs
+	for i, record := range records {
+		jobs <- ImportJob{Record: record, Index: i}
+	}
+	close(jobs)
+
+	// Wait and close results
+	go func() {
+		wg.Wait()
+		close(results)
+	}()
+
+	// Collect results
+	var firstError error
+	for result := range results {
+		if result.Skipped {
+			skipped++
+		} else if result.Success {
+			migrated++
+		} else {
+			failed++
+			if firstError == nil && result.Error != nil {
+				firstError = result.Error
+			}
+		}
+	}
+
+	// Progress display
+	elapsed := time.Since(startTime)
+	rate := float64(totalRead) / elapsed.Seconds()
+
+	var lastDate string
+	if len(records) > 0 {
+		if t, err := parseTimestamp(records[len(records)-1].CreatedAt); err == nil {
+			lastDate = t.Format("2006-01-02")
+		}
+	}
+
+	fmt.Printf("[Batch %d] Read: %d | Migrated: %d | Skipped: %d | Failed: %d | %.0f rec/s | Last: %s | Batch: %v\n",
+		batchNum, totalRead, migrated, skipped, failed, rate, lastDate, time.Since(batchStart).Round(time.Millisecond))
+
+	// Show first error for debugging
+	if firstError != nil && batchNum <= 3 {
+		fmt.Printf("         [ERROR] Sample error: %v\n", firstError)
+	}
+
+	return migrated, skipped, failed
+}
+
+// runSQLExport generates a SQL file for direct SQLite import (fastest method!)
+func runSQLExport(jsonFile, sqlOutput, tableName string) {
+	fmt.Println("=========================================================")
+	fmt.Println("        SQL Export Mode (Direct SQLite Import)")
+	fmt.Println("=========================================================")
+	fmt.Printf("JSON File:   %s\n", jsonFile)
+	fmt.Printf("SQL Output:  %s\n", sqlOutput)
+	fmt.Printf("Table:       %s\n", tableName)
+	fmt.Printf("Repo Source: %s\n", repoSource)
+	fmt.Println("---------------------------------------------------------")
+
+	// Open JSON file
+	file, err := os.Open(jsonFile)
+	if err != nil {
+		fmt.Printf("[ERROR] Cannot open JSON file: %v\n", err)
+		os.Exit(1)
+	}
+	defer file.Close()
+
+	// Get file size for progress
+	fileInfo, _ := file.Stat()
+	fileSize := fileInfo.Size()
+	fmt.Printf("[INFO] File size: %.2f GB\n", float64(fileSize)/(1024*1024*1024))
+
+	// Open SQL output file stream
+	sqlFile, err := os.Create(sqlOutput)
+	if err != nil {
+		fmt.Printf("[ERROR] Cannot create SQL file: %v\n", err)
+		os.Exit(1)
+	}
+	defer sqlFile.Close()
+
+	writer := bufio.NewWriterSize(sqlFile, 1*1024*1024) // 1MB buffer for faster feedback
+
+	// Write SQL header
+	writer.WriteString("-- Auto-generated SQL import for PocketBase\n")
+	writer.WriteString("-- Generated: " + time.Now().Format(time.RFC3339) + "\n")
+	writer.WriteString("PRAGMA journal_mode=WAL;\n")
+	writer.WriteString("PRAGMA synchronous=OFF;\n")
+	writer.WriteString("PRAGMA cache_size=100000;\n")
+	writer.WriteString("BEGIN TRANSACTION;\n\n")
+	writer.Flush() // Flush header immediately
+	fmt.Println("[INFO] SQL header written, starting record processing...")
+
+	startTime := time.Now()
+	var recordCount int64
+	var filteredCount int64
+	var skippedCount int64
+
+	// Create decoder directly from file (not buffered reader)
+	decoder := json.NewDecoder(file)
+	
+	// Read opening bracket of array
+	fmt.Println("[INFO] Reading JSON array...")
+	token, err := decoder.Token()
+	if err != nil {
+		fmt.Printf("[ERROR] Cannot read JSON: %v\n", err)
+		os.Exit(1)
+	}
+	if delim, ok := token.(json.Delim); !ok || delim != '[' {
+		fmt.Printf("[ERROR] Expected JSON array, got: %v\n", token)
+		os.Exit(1)
+	}
+	fmt.Println("[INFO] Found JSON array, starting decode...")
+
+	// Decode each element
+	for decoder.More() {
+		var mongoRecord MongoDataModel
+		if err := decoder.Decode(&mongoRecord); err != nil {
+			if err == io.EOF {
+				break
+			}
+			skippedCount++
+			// Log first few errors for debugging
+			if skippedCount <= 5 {
+				fmt.Printf("[WARN] Skipping malformed record #%d: %v\n", skippedCount, err)
+			}
+			continue
+		}
+
+		// Convert MongoDB format to normal format
+		record := OldDataModel{
+			ID:         parseMongoString(mongoRecord.ID),
+			CtType:     parseMongoInt(mongoRecord.CtType),
+			DiskSize:   parseMongoInt(mongoRecord.DiskSize),
+			CoreCount:  parseMongoInt(mongoRecord.CoreCount),
+			RamSize:    parseMongoInt(mongoRecord.RamSize),
+			OsType:     mongoRecord.OsType,
+			OsVersion:  mongoRecord.OsVersion,
+			DisableIP6: mongoRecord.DisableIP6,
+			NsApp:      mongoRecord.NsApp,
+			Method:     mongoRecord.Method,
+			CreatedAt:  parseMongoDate(mongoRecord.CreatedAt),
+			PveVersion: mongoRecord.PveVersion,
+			Status:     mongoRecord.Status,
+			RandomID:   mongoRecord.RandomID,
+			Type:       mongoRecord.Type,
+		}
+		if mongoRecord.Error != nil {
+			record.Error = *mongoRecord.Error
+		}
+
+		// Apply date filters
+		if hasDateFrom || hasDateUntil {
+			recordTime, err := parseTimestamp(record.CreatedAt)
+			if err == nil {
+				if hasDateFrom && recordTime.Before(dateFrom) {
+					filteredCount++
+					continue
+				}
+				if hasDateUntil && recordTime.After(dateUntil) {
+					filteredCount++
+					continue
+				}
+			}
+		}
+
+		// Generate unique ID for PocketBase
+		pbID := generatePocketBaseID()
+
+		// Normalize values
+		status := record.Status
+		if status == "done" {
+			status = "success"
+		}
+		if status == "" {
+			status = "unknown"
+		}
+
+		nsapp := record.NsApp
+		if nsapp == "" {
+			nsapp = "unknown"
+		}
+
+		recType := record.Type
+		if recType == "" {
+			recType = "lxc"
+		}
+
+		// Format created date
+		createdAt := record.CreatedAt
+		if createdAt == "" {
+			createdAt = time.Now().UTC().Format("2006-01-02 15:04:05.000Z")
+		}
+
+		// Escape strings for SQL
+		escapeSQLString := func(s string) string {
+			return strings.ReplaceAll(s, "'", "''")
+		}
+
+		// Write INSERT statement (disableip6 removed - column no longer exists)
+		sql := fmt.Sprintf(
+			"INSERT OR IGNORE INTO %s (id,created,updated,ct_type,disk_size,core_count,ram_size,os_type,os_version,nsapp,method,pve_version,status,random_id,type,error,repo_source) VALUES ('%s','%s','%s',%d,%d,%d,%d,'%s','%s','%s','%s','%s','%s','%s','%s','%s','%s');\n",
+			tableName,
+			pbID,
+			escapeSQLString(createdAt),
+			escapeSQLString(createdAt),
+			record.CtType,
+			record.DiskSize,
+			record.CoreCount,
+			record.RamSize,
+			escapeSQLString(record.OsType),
+			escapeSQLString(record.OsVersion),
+			escapeSQLString(nsapp),
+			escapeSQLString(record.Method),
+			escapeSQLString(record.PveVersion),
+			escapeSQLString(status),
+			escapeSQLString(record.RandomID),
+			escapeSQLString(recType),
+			escapeSQLString(record.Error),
+			escapeSQLString(repoSource),
+		)
+
+		writer.WriteString(sql)
+		recordCount++
+
+		// Progress every 10k records (and flush to show file growing)
+		if recordCount%10000 == 0 {
+			writer.Flush()
+			elapsed := time.Since(startTime)
+			rate := float64(recordCount) / elapsed.Seconds()
+			fmt.Printf("[PROGRESS] %d records processed (%.0f rec/s)\n", recordCount, rate)
+		}
+	}
+
+	// Write footer
+	writer.WriteString("\nCOMMIT;\n")
+	writer.Flush()
+
+	elapsed := time.Since(startTime)
+	rate := float64(recordCount) / elapsed.Seconds()
+
+	fmt.Println()
+	fmt.Println("=========================================================")
+	fmt.Println("        SQL Export Complete")
+	fmt.Println("=========================================================")
+	fmt.Printf("Records exported:    %d\n", recordCount)
+	fmt.Printf("Skipped (errors):    %d\n", skippedCount)
+	fmt.Printf("Filtered (date):     %d\n", filteredCount)
+	fmt.Printf("Duration:            %s\n", formatDuration(elapsed))
+	fmt.Printf("Speed:               %.0f records/sec\n", rate)
+	fmt.Printf("Output file:         %s\n", sqlOutput)
+	fmt.Println("---------------------------------------------------------")
+	fmt.Println()
+	fmt.Println("To import into PocketBase:")
+	fmt.Printf("  sqlite3 /app/pb_data/data.db < %s\n", sqlOutput)
+	fmt.Println()
+}
+
+// generatePocketBaseID generates a 15-char alphanumeric ID like PocketBase does
+func generatePocketBaseID() string {
+	const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
+	b := make([]byte, 15)
+	// Use crypto/rand for randomness
+	randBytes := make([]byte, 15)
+	if _, err := io.ReadFull(cryptoRand.Reader, randBytes); err != nil {
+		// Fallback to time-based
+		for i := range b {
+			b[i] = chars[(time.Now().UnixNano()+int64(i))%int64(len(chars))]
+		}
+		return string(b)
+	}
+	for i := range b {
+		b[i] = chars[randBytes[i]%byte(len(chars))]
+	}
+	return string(b)
+}
diff --git a/misc/data/migration/migrate.sh b/misc/data/migration/migrate.sh
index 5ed189389..09d086cc9 100644
--- a/misc/data/migration/migrate.sh
+++ b/misc/data/migration/migrate.sh
@@ -13,7 +13,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # Default values
 POCKETBASE_URL="${1:-http://localhost:8090}"
-POCKETBASE_COLLECTION="${2:-_dev_telemetry_data}"
+POCKETBASE_COLLECTION="${2:-telemetry}"
 
 echo "============================================="
 echo "   ProxmoxVED Data Migration Tool"
diff --git a/misc/data/migration/migration.go b/misc/data/migration/migration.go
index e1c500418..c75095e3d 100644
--- a/misc/data/migration/migration.go
+++ b/misc/data/migration/migration.go
@@ -95,13 +95,13 @@ func main() {
 		pbCollection = os.Getenv("PB_TARGET_COLLECTION")
 	}
 	if pbCollection == "" {
-		pbCollection = "_dev_telemetry_data"
+		pbCollection = "telemetry"
 	}
 
 	// Auth collection
 	authCollection := os.Getenv("PB_AUTH_COLLECTION")
 	if authCollection == "" {
-		authCollection = "_dev_telemetry_service"
+		authCollection = "telemetry_service_user"
 	}
 
 	// Credentials - prefer admin auth for timestamp preservation
diff --git a/misc/data/service.go b/misc/data/service.go
index 4ae810d28..3e3e8366d 100644
--- a/misc/data/service.go
+++ b/misc/data/service.go
@@ -24,11 +24,10 @@ type Config struct {
 
 	// PocketBase
 	PBBaseURL        string
-	PBAuthCollection string // "_dev_telemetry_service"
+	PBAuthCollection string // PB auth collection name (from env)
 	PBIdentity       string // email
 	PBPassword       string
-	PBTargetColl     string // "_dev_telemetry_data" (dev default)
-	PBLiveTargetColl string // "_live_telemetry_data" (production)
+	PBTargetColl     string // PB data collection name (from env)
 
 	// Limits
 	MaxBodyBytes     int64
@@ -104,10 +103,10 @@ type TelemetryIn struct {
 	ErrorCategory string `json:"error_category,omitempty"` // "network", "storage", "dependency", "permission", "timeout", "unknown"
 
 	// Repository source for collection routing
-	RepoSource string `json:"repo_source,omitempty"` // "community-scripts/ProxmoxVE" or "community-scripts/ProxmoxVED"
+	RepoSource string `json:"repo_source,omitempty"` // "ProxmoxVE", "ProxmoxVED", or "external"
 }
 
-// TelemetryOut is sent to PocketBase (matches _dev_telemetry_data collection)
+// TelemetryOut is sent to PocketBase (matches telemetry collection)
 type TelemetryOut struct {
 	RandomID  string `json:"random_id"`
 	Type      string `json:"type"`
@@ -133,6 +132,9 @@ type TelemetryOut struct {
 	RAMSpeed        string `json:"ram_speed,omitempty"`
 	InstallDuration int    `json:"install_duration,omitempty"`
 	ErrorCategory   string `json:"error_category,omitempty"`
+
+	// Repository source: "ProxmoxVE", "ProxmoxVED", or "external"
+	RepoSource string `json:"repo_source,omitempty"`
 }
 
 // TelemetryStatusUpdate contains only fields needed for status updates
@@ -150,10 +152,11 @@ type TelemetryStatusUpdate struct {
 	RAMSpeed        string `json:"ram_speed,omitempty"`
 }
 
-// Allowed values for 'repo_source' field — controls collection routing
+// Allowed values for 'repo_source' field
 var allowedRepoSource = map[string]bool{
-	"community-scripts/ProxmoxVE":  true,
-	"community-scripts/ProxmoxVED": true,
+	"ProxmoxVE":  true,
+	"ProxmoxVED": true,
+	"external":   true,
 }
 
 type PBClient struct {
@@ -161,8 +164,7 @@ type PBClient struct {
 	authCollection string
 	identity       string
 	password       string
-	devColl        string // "_dev_telemetry_data"
-	liveColl       string // "_live_telemetry_data"
+	targetColl     string // single collection for all telemetry data
 
 	mu    sync.Mutex
 	token string
@@ -176,25 +178,13 @@ func NewPBClient(cfg Config) *PBClient {
 		authCollection: cfg.PBAuthCollection,
 		identity:       cfg.PBIdentity,
 		password:       cfg.PBPassword,
-		devColl:        cfg.PBTargetColl,
-		liveColl:       cfg.PBLiveTargetColl,
+		targetColl:     cfg.PBTargetColl,
 		http: &http.Client{
 			Timeout: cfg.RequestTimeout,
 		},
 	}
 }
 
-// resolveCollection maps a repo_source value to the correct PocketBase collection.
-// - "community-scripts/ProxmoxVE"  → live collection
-// - "community-scripts/ProxmoxVED" → dev collection
-// - empty / unknown                → dev collection (safe default)
-func (p *PBClient) resolveCollection(repoSource string) string {
-	if repoSource == "community-scripts/ProxmoxVE" && p.liveColl != "" {
-		return p.liveColl
-	}
-	return p.devColl
-}
-
 func (p *PBClient) ensureAuth(ctx context.Context) error {
 	p.mu.Lock()
 	defer p.mu.Unlock()
@@ -246,8 +236,8 @@ func (p *PBClient) ensureAuth(ctx context.Context) error {
 	return nil
 }
 
-// FindRecordByRandomID searches for an existing record by random_id in the given collection
-func (p *PBClient) FindRecordByRandomID(ctx context.Context, coll, randomID string) (string, error) {
+// FindRecordByRandomID searches for an existing record by random_id
+func (p *PBClient) FindRecordByRandomID(ctx context.Context, randomID string) (string, error) {
 	if err := p.ensureAuth(ctx); err != nil {
 		return "", err
 	}
@@ -256,7 +246,7 @@ func (p *PBClient) FindRecordByRandomID(ctx context.Context, coll, randomID stri
 	filter := fmt.Sprintf("random_id='%s'", randomID)
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet,
 		fmt.Sprintf("%s/api/collections/%s/records?filter=%s&fields=id&perPage=1",
-			p.baseURL, coll, filter),
+			p.baseURL, p.targetColl, filter),
 		nil,
 	)
 	if err != nil {
@@ -290,14 +280,14 @@ func (p *PBClient) FindRecordByRandomID(ctx context.Context, coll, randomID stri
 }
 
 // UpdateTelemetryStatus updates only status, error, and exit_code of an existing record
-func (p *PBClient) UpdateTelemetryStatus(ctx context.Context, coll, recordID string, update TelemetryStatusUpdate) error {
+func (p *PBClient) UpdateTelemetryStatus(ctx context.Context, recordID string, update TelemetryStatusUpdate) error {
 	if err := p.ensureAuth(ctx); err != nil {
 		return err
 	}
 
 	b, _ := json.Marshal(update)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPatch,
-		fmt.Sprintf("%s/api/collections/%s/records/%s", p.baseURL, coll, recordID),
+		fmt.Sprintf("%s/api/collections/%s/records/%s", p.baseURL, p.targetColl, recordID),
 		bytes.NewReader(b),
 	)
 	if err != nil {
@@ -319,8 +309,7 @@ func (p *PBClient) UpdateTelemetryStatus(ctx context.Context, coll, recordID str
 }
 
 // FetchRecordsPaginated retrieves records with pagination and optional filters.
-// Uses devColl by default (dashboard shows dev data); for live data, use separate endpoint if needed.
-func (p *PBClient) FetchRecordsPaginated(ctx context.Context, page, limit int, status, app, osType, sortField string) ([]TelemetryRecord, int, error) {
+func (p *PBClient) FetchRecordsPaginated(ctx context.Context, page, limit int, status, app, osType, typeFilter, sortField, repoSource string) ([]TelemetryRecord, int, error) {
 	if err := p.ensureAuth(ctx); err != nil {
 		return nil, 0, err
 	}
@@ -336,6 +325,12 @@ func (p *PBClient) FetchRecordsPaginated(ctx context.Context, page, limit int, s
 	if osType != "" {
 		filters = append(filters, fmt.Sprintf("os_type='%s'", osType))
 	}
+	if typeFilter != "" {
+		filters = append(filters, fmt.Sprintf("type='%s'", typeFilter))
+	}
+	if repoSource != "" {
+		filters = append(filters, fmt.Sprintf("repo_source='%s'", repoSource))
+	}
 
 	filterStr := ""
 	if len(filters) > 0 {
@@ -361,7 +356,7 @@ func (p *PBClient) FetchRecordsPaginated(ctx context.Context, page, limit int, s
 	}
 
 	reqURL := fmt.Sprintf("%s/api/collections/%s/records?sort=%s&page=%d&perPage=%d%s",
-		p.baseURL, p.devColl, sort, page, limit, filterStr)
+		p.baseURL, p.targetColl, sort, page, limit, filterStr)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil)
 	if err != nil {
@@ -391,22 +386,18 @@ func (p *PBClient) FetchRecordsPaginated(ctx context.Context, page, limit int, s
 }
 
 // UpsertTelemetry handles both creation and updates intelligently.
-// Routes to the correct PocketBase collection based on repoSource:
-//   - "community-scripts/ProxmoxVE"  → _live_telemetry_data
-//   - "community-scripts/ProxmoxVED" → _dev_telemetry_data
+// All records go to the same collection; repo_source is stored as a field.
 //
 // For status="installing": always creates a new record.
 // For status!="installing": updates existing record (found by random_id).
-func (p *PBClient) UpsertTelemetry(ctx context.Context, payload TelemetryOut, repoSource string) error {
-	coll := p.resolveCollection(repoSource)
-
+func (p *PBClient) UpsertTelemetry(ctx context.Context, payload TelemetryOut) error {
 	// For "installing" status, always create new record
 	if payload.Status == "installing" {
-		return p.CreateTelemetry(ctx, coll, payload)
+		return p.CreateTelemetry(ctx, payload)
 	}
 
 	// For status updates (success/failed/unknown), find and update existing record
-	recordID, err := p.FindRecordByRandomID(ctx, coll, payload.RandomID)
+	recordID, err := p.FindRecordByRandomID(ctx, payload.RandomID)
 	if err != nil {
 		// Search failed, log and return error
 		return fmt.Errorf("cannot find record to update: %w", err)
@@ -415,7 +406,7 @@ func (p *PBClient) UpsertTelemetry(ctx context.Context, payload TelemetryOut, re
 	if recordID == "" {
 		// Record not found - this shouldn't happen normally
 		// Create a full record as fallback
-		return p.CreateTelemetry(ctx, coll, payload)
+		return p.CreateTelemetry(ctx, payload)
 	}
 
 	// Update only status, error, exit_code, and new metrics fields
@@ -432,17 +423,17 @@ func (p *PBClient) UpsertTelemetry(ctx context.Context, payload TelemetryOut, re
 		CPUModel:        payload.CPUModel,
 		RAMSpeed:        payload.RAMSpeed,
 	}
-	return p.UpdateTelemetryStatus(ctx, coll, recordID, update)
+	return p.UpdateTelemetryStatus(ctx, recordID, update)
 }
 
-func (p *PBClient) CreateTelemetry(ctx context.Context, coll string, payload TelemetryOut) error {
+func (p *PBClient) CreateTelemetry(ctx context.Context, payload TelemetryOut) error {
 	if err := p.ensureAuth(ctx); err != nil {
 		return err
 	}
 
 	b, _ := json.Marshal(payload)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost,
-		fmt.Sprintf("%s/api/collections/%s/records", p.baseURL, coll),
+		fmt.Sprintf("%s/api/collections/%s/records", p.baseURL, p.targetColl),
 		bytes.NewReader(b),
 	)
 	if err != nil {
@@ -730,9 +721,9 @@ func validate(in *TelemetryIn) error {
 		return errors.New("invalid install_duration (max 24h)")
 	}
 
-	// Validate repo_source: must be an allowed repository or empty
+	// Validate repo_source: must be a known value or empty
 	if in.RepoSource != "" && !allowedRepoSource[in.RepoSource] {
-		return errors.New("invalid repo_source (must be 'community-scripts/ProxmoxVE' or 'community-scripts/ProxmoxVED')")
+		return fmt.Errorf("rejected repo_source '%s' (must be 'ProxmoxVE', 'ProxmoxVED', or 'external')", in.RepoSource)
 	}
 
 	return nil
@@ -755,11 +746,10 @@ func main() {
 		TrustedProxiesCIDR: splitCSV(env("TRUSTED_PROXIES_CIDR", "")),
 
 		PBBaseURL:        mustEnv("PB_URL"),
-		PBAuthCollection: env("PB_AUTH_COLLECTION", "_dev_telemetry_service"),
+		PBAuthCollection: mustEnv("PB_AUTH_COLLECTION"),
 		PBIdentity:       mustEnv("PB_IDENTITY"),
 		PBPassword:       mustEnv("PB_PASSWORD"),
-		PBTargetColl:     env("PB_TARGET_COLLECTION", "_dev_telemetry_data"),
-		PBLiveTargetColl: env("PB_LIVE_TARGET_COLLECTION", "_live_telemetry_data"),
+		PBTargetColl:     mustEnv("PB_TARGET_COLLECTION"),
 
 		MaxBodyBytes:     envInt64("MAX_BODY_BYTES", 1024),
 		RateLimitRPM:     envInt("RATE_LIMIT_RPM", 60),
@@ -772,7 +762,7 @@ func main() {
 		// Cache config
 		RedisURL:     env("REDIS_URL", ""),
 		EnableRedis:  envBool("ENABLE_REDIS", false),
-		CacheTTL:     time.Duration(envInt("CACHE_TTL_SECONDS", 60)) * time.Second,
+		CacheTTL:     time.Duration(envInt("CACHE_TTL_SECONDS", 300)) * time.Second,
 		CacheEnabled: envBool("ENABLE_CACHE", true),
 
 		// Alert config
@@ -870,7 +860,7 @@ func main() {
 		ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
 		defer cancel()
 		
-		data, err := pb.FetchDashboardData(ctx, 1) // Last 24h only for metrics
+		data, err := pb.FetchDashboardData(ctx, 1, "ProxmoxVE") // Last 24h, production only for metrics
 		if err != nil {
 			http.Error(w, "failed to fetch metrics", http.StatusInternalServerError)
 			return
@@ -896,22 +886,31 @@ func main() {
 
 	// Dashboard API endpoint (with caching)
 	mux.HandleFunc("/api/dashboard", func(w http.ResponseWriter, r *http.Request) {
-		days := 30
+		days := 7 // Default: 7 days
 		if d := r.URL.Query().Get("days"); d != "" {
 			fmt.Sscanf(d, "%d", &days)
-			if days < 1 {
-				days = 1
-			}
-			if days > 365 {
-				days = 365
+			// days=0 means "all entries", negative values are invalid
+			if days < 0 {
+				days = 7
 			}
 		}
 
-		ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
+		// repo_source filter (default: ProxmoxVE)
+		repoSource := r.URL.Query().Get("repo")
+		if repoSource == "" {
+			repoSource = "ProxmoxVE"
+		}
+		// "all" means no filter
+		if repoSource == "all" {
+			repoSource = ""
+		}
+
+		// Increase timeout for large datasets (dashboard aggregation takes time)
+		ctx, cancel := context.WithTimeout(r.Context(), 120*time.Second)
 		defer cancel()
 
 		// Try cache first
-		cacheKey := fmt.Sprintf("dashboard:%d", days)
+		cacheKey := fmt.Sprintf("dashboard:%d:%s", days, repoSource)
 		var data *DashboardData
 		if cfg.CacheEnabled && cache.Get(ctx, cacheKey, &data) {
 			w.Header().Set("Content-Type", "application/json")
@@ -920,7 +919,7 @@ func main() {
 			return
 		}
 
-		data, err := pb.FetchDashboardData(ctx, days)
+		data, err := pb.FetchDashboardData(ctx, days, repoSource)
 		if err != nil {
 			log.Printf("dashboard fetch failed: %v", err)
 			http.Error(w, "failed to fetch data", http.StatusInternalServerError)
@@ -944,7 +943,12 @@ func main() {
 		status := r.URL.Query().Get("status")
 		app := r.URL.Query().Get("app")
 		osType := r.URL.Query().Get("os")
+		typeFilter := r.URL.Query().Get("type")
 		sort := r.URL.Query().Get("sort")
+		repoSource := r.URL.Query().Get("repo")
+		if repoSource == "" {
+			repoSource = "ProxmoxVE" // Default filter: production data
+		}
 
 		if p := r.URL.Query().Get("page"); p != "" {
 			fmt.Sscanf(p, "%d", &page)
@@ -965,7 +969,7 @@ func main() {
 		ctx, cancel := context.WithTimeout(r.Context(), 10*time.Second)
 		defer cancel()
 
-		records, total, err := pb.FetchRecordsPaginated(ctx, page, limit, status, app, osType, sort)
+		records, total, err := pb.FetchRecordsPaginated(ctx, page, limit, status, app, osType, typeFilter, sort, repoSource)
 		if err != nil {
 			log.Printf("records fetch failed: %v", err)
 			http.Error(w, "failed to fetch records", http.StatusInternalServerError)
@@ -1052,6 +1056,9 @@ func main() {
 			return
 		}
 		if err := validate(&in); err != nil {
+			if cfg.EnableReqLogging {
+				log.Printf("telemetry rejected: %v", err)
+			}
 			http.Error(w, "invalid payload", http.StatusBadRequest)
 			return
 		}
@@ -1080,6 +1087,7 @@ func main() {
 			RAMSpeed:        in.RAMSpeed,
 			InstallDuration: in.InstallDuration,
 			ErrorCategory:   in.ErrorCategory,
+			RepoSource:      in.RepoSource,
 		}
 		_ = computeHash(out) // For future deduplication
 
@@ -1087,8 +1095,8 @@ func main() {
 		defer cancel()
 
 		// Upsert: Creates new record if random_id doesn't exist, updates if it does
-		// Routes to correct collection based on repo_source
-		if err := pb.UpsertTelemetry(ctx, out, in.RepoSource); err != nil {
+		// repo_source is stored as a field on the record for filtering
+		if err := pb.UpsertTelemetry(ctx, out); err != nil {
 			// GDPR: don't log raw payload, don't log IPs; log only generic error
 			log.Printf("pocketbase write failed: %v", err)
 			http.Error(w, "upstream error", http.StatusBadGateway)
@@ -1096,7 +1104,7 @@ func main() {
 		}
 
 		if cfg.EnableReqLogging {
-			log.Printf("telemetry accepted nsapp=%s status=%s", out.NSAPP, out.Status)
+			log.Printf("telemetry accepted nsapp=%s status=%s repo=%s", out.NSAPP, out.Status, in.RepoSource)
 		}
 
 		w.WriteHeader(http.StatusAccepted)
@@ -1109,6 +1117,22 @@ func main() {
 		ReadHeaderTimeout: 3 * time.Second,
 	}
 
+	// Background cache warmup job - pre-populates cache for common dashboard queries
+	if cfg.CacheEnabled {
+		go func() {
+			// Initial warmup after startup
+			time.Sleep(10 * time.Second)
+			warmupDashboardCache(pb, cache, cfg)
+			
+			// Periodic refresh (every 4 minutes, before 5-minute TTL expires)
+			ticker := time.NewTicker(4 * time.Minute)
+			for range ticker.C {
+				warmupDashboardCache(pb, cache, cfg)
+			}
+		}()
+		log.Println("background cache warmup enabled")
+	}
+
 	log.Printf("telemetry-ingest listening on %s", cfg.ListenAddr)
 	log.Fatal(srv.ListenAndServe())
 }
@@ -1194,4 +1218,44 @@ func splitCSV(s string) []string {
 		}
 	}
 	return out
+}
+
+// warmupDashboardCache pre-populates the cache with common dashboard queries
+func warmupDashboardCache(pb *PBClient, cache *Cache, cfg Config) {
+	log.Println("[CACHE] Starting dashboard cache warmup...")
+	
+	// Common day ranges and repos to pre-cache
+	dayRanges := []int{7, 30, 90}
+	repos := []string{"ProxmoxVE", ""}  // ProxmoxVE and "all"
+	
+	warmed := 0
+	for _, days := range dayRanges {
+		for _, repo := range repos {
+			ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
+			
+			cacheKey := fmt.Sprintf("dashboard:%d:%s", days, repo)
+			
+			// Check if already cached
+			var existing *DashboardData
+			if cache.Get(ctx, cacheKey, &existing) {
+				cancel()
+				continue // Already cached, skip
+			}
+			
+			// Fetch and cache
+			data, err := pb.FetchDashboardData(ctx, days, repo)
+			cancel()
+			
+			if err != nil {
+				log.Printf("[CACHE] Warmup failed for days=%d repo=%s: %v", days, repo, err)
+				continue
+			}
+			
+			_ = cache.Set(context.Background(), cacheKey, data, cfg.CacheTTL)
+			warmed++
+			log.Printf("[CACHE] Warmed cache for days=%d repo=%s (%d installs)", days, repo, data.TotalAllTime)
+		}
+	}
+	
+	log.Printf("[CACHE] Dashboard cache warmup complete (%d entries)", warmed)
 }
\ No newline at end of file
diff --git a/misc/tools.func b/misc/tools.func
index 40ad30a2b..a89fec2f7 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -1778,7 +1778,7 @@ function fetch_and_deploy_gh_release() {
   local app="$1"
   local repo="$2"
   local mode="${3:-tarball}" # tarball | binary | prebuild | singlefile | tag
-  local version="${APPLICATION_VERSION:-${4:-latest}}"
+  local version="${var_appversion:-${4:-latest}}"
   local target="${5:-/opt/$app}"
   local asset_pattern="${6:-}"
 
@@ -2246,7 +2246,7 @@ function fetch_and_deploy_codeberg_release() {
   local app="$1"
   local repo="$2"
   local mode="${3:-tarball}" # tarball | binary | prebuild | singlefile | tag
-  local version="${APPLICATION_VERSION:-${4:-latest}}"
+  local version="${var_appversion:-${4:-latest}}"
   local target="${5:-/opt/$app}"
   local asset_pattern="${6:-}"
 
diff --git a/vm/cachyos-vm.sh b/vm/cachyos-vm.sh
new file mode 100644
index 000000000..e1108bea0
--- /dev/null
+++ b/vm/cachyos-vm.sh
@@ -0,0 +1,588 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE
+
+# ==============================================================================
+# CachyOS VM - Creates a CachyOS Virtual Machine
+# CachyOS is a performance-focused Arch Linux distribution with optimized 
+# packages, custom kernels, and various desktop environment options.
+# ==============================================================================
+
+source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/api.func)
+
+function header_info {
+  clear
+  cat <<"EOF"
+   ______           __          ____  _____
+  / ____/___ ______/ /_  __  __/ __ \/ ___/
+ / /   / __ `/ ___/ __ \/ / / / / / /\__ \ 
+/ /___/ /_/ / /__/ / / / /_/ / /_/ /___/ / 
+\____/\__,_/\___/_/ /_/\__, /\____//____/  
+                      /____/               
+         Performance-Optimized Arch Linux
+EOF
+}
+
+header_info
+echo -e "\n Loading..."
+RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
+METHOD=""
+NSAPP="cachyos-vm"
+var_os="cachyos"
+var_version=" "
+GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
+
+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")
+
+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}"
+
+THIN="discard=on,ssd=1,"
+set -e
+trap 'error_handler $LINENO "$BASH_COMMAND"' ERR
+trap cleanup EXIT
+trap 'post_update_to_api "failed" "INTERRUPTED"' SIGINT
+trap 'post_update_to_api "failed" "TERMINATED"' SIGTERM
+
+function error_handler() {
+  local exit_code="$?"
+  local line_number="$1"
+  local command="$2"
+  post_update_to_api "failed" "${command}"
+  local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}"
+  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() {
+  popd >/dev/null
+  rm -rf $TEMP_DIR
+}
+
+TEMP_DIR=$(mktemp -d)
+pushd $TEMP_DIR >/dev/null
+if whiptail --backtitle "Proxmox VE Helper Scripts" --title "CachyOS VM" --yesno "This will create a New CachyOS VM.\n\nCachyOS is a performance-optimized Arch Linux distribution with:\n• Custom kernels tuned for performance\n• Optimized packages with LTO/PGO\n• Multiple desktop environments (KDE, GNOME, XFCE, etc.)\n• BORE/EEVDF/sched-ext CPU schedulers\n\nYou will need to complete the installation via the graphical Calamares installer.\n\nProceed?" 18 68; 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() {
+  if ! pveversion | grep -Eq "pve-manager/(8\.[1-4]|9\.[0-1])(\.[0-9]+)*"; then
+    msg_error "${CROSS}${RD}This version of Proxmox Virtual Environment is not supported"
+    echo -e "Requires Proxmox Virtual Environment Version 8.1 - 8.4 or 9.0 - 9.1."
+    echo -e "Exiting..."
+    sleep 2
+    exit
+  fi
+}
+
+function arch_check() {
+  if [ "$(dpkg --print-architecture)" != "amd64" ]; then
+    echo -e "\n ${INFO}${YW}This script will not work with PiMox! \n"
+    echo -e "\n ${YW}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
+}
+
+# ==============================================================================
+# DEFAULT SETTINGS - Optimized for desktop usage with GUI
+# ==============================================================================
+function default_settings() {
+  VMID=$(get_valid_nextid)
+  FORMAT=""
+  MACHINE=" -machine q35"
+  DISK_SIZE="40G"
+  DISK_CACHE=""
+  HN="cachyos"
+  CPU_TYPE=" -cpu host"
+  CORE_COUNT="4"
+  RAM_SIZE="8192"
+  BRG="vmbr0"
+  MAC="$GEN_MAC"
+  VLAN=""
+  MTU=""
+  START_VM="yes"
+  METHOD="default"
+  echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
+  echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
+  echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
+  echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
+  echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host (Recommended for CachyOS optimizations)${CL}"
+  echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+  echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE} MiB${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 CachyOS VM using the above default settings${CL}"
+}
+
+# ==============================================================================
+# ADVANCED SETTINGS
+# ==============================================================================
+function advanced_settings() {
+  METHOD="advanced"
+  [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid)
+
+  # VM ID
+  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
+
+  # Machine Type
+  if MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
+    "q35" "Q35 (Modern, PCIe - Recommended)" ON \
+    "i440fx" "i440fx (Legacy, PCI)" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ $MACH = q35 ]; then
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
+      FORMAT=""
+      MACHINE=" -machine q35"
+    else
+      echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx (Legacy)${CL}"
+      FORMAT=",efitype=4m"
+      MACHINE=""
+    fi
+  else
+    exit-script
+  fi
+
+  # Disk Size
+  if DISK_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Disk Size in GiB (Recommended: 40+ for desktop)" 8 58 "40" --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., 40 or 40G).${CL}"
+      exit-script
+    fi
+  else
+    exit-script
+  fi
+
+  # Disk Cache
+  if DISK_CACHE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISK CACHE" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
+    "0" "None (Default)" ON \
+    "1" "Write Through" OFF \
+    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
+
+  # Hostname
+  if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 cachyos --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $VM_NAME ]; then
+      HN="cachyos"
+    else
+      HN=$(echo ${VM_NAME,,} | tr -d ' ')
+    fi
+    echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
+  else
+    exit-script
+  fi
+
+  # CPU Model
+  if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose (Host recommended for CachyOS optimizations)" --cancel-button Exit-Script 10 68 2 \
+    "1" "Host (Recommended - enables x86-64-v3/v4)" ON \
+    "0" "KVM64 (Compatible)" OFF \
+    3>&1 1>&2 2>&3); then
+    if [ $CPU_TYPE1 = "1" ]; then
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
+      CPU_TYPE=" -cpu host"
+    else
+      echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}"
+      CPU_TYPE=""
+    fi
+  else
+    exit-script
+  fi
+
+  # CPU Cores
+  if CORE_COUNT=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate CPU Cores (Recommended: 4+ for desktop)" 8 58 4 --title "CORE COUNT" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $CORE_COUNT ]; then
+      CORE_COUNT="4"
+    fi
+    echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
+  else
+    exit-script
+  fi
+
+  # RAM Size
+  if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB (Recommended: 8192+ for desktop)" 8 58 8192 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+    if [ -z $RAM_SIZE ]; then
+      RAM_SIZE="8192"
+    fi
+    echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE MiB${CL}"
+  else
+    exit-script
+  fi
+
+  # Bridge
+  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"
+    fi
+    echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}$BRG${CL}"
+  else
+    exit-script
+  fi
+
+  # MAC Address
+  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"
+    else
+      MAC="$MAC1"
+    fi
+    echo -e "${MACADDRESS}${BOLD}${DGN}MAC Address: ${BGN}$MAC${CL}"
+  else
+    exit-script
+  fi
+
+  # VLAN
+  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=""
+    else
+      VLAN=",tag=$VLAN1"
+    fi
+    echo -e "${VLANTAG}${BOLD}${DGN}VLAN: ${BGN}$VLAN1${CL}"
+  else
+    exit-script
+  fi
+
+  # MTU
+  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=""
+    else
+      MTU=",mtu=$MTU1"
+    fi
+    echo -e "${DEFAULT}${BOLD}${DGN}Interface MTU Size: ${BGN}$MTU1${CL}"
+  else
+    exit-script
+  fi
+
+  # Start VM
+  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
+
+  # Confirm
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "ADVANCED SETTINGS COMPLETE" --yesno "Ready to create a CachyOS VM?" --no-button Do-Over 10 58); then
+    echo -e "${CREATING}${BOLD}${DGN}Creating a CachyOS VM using the above advanced settings${CL}"
+  else
+    header_info
+    echo -e "${ADVANCED}${BOLD}${RD}Using Advanced Settings${CL}"
+    advanced_settings
+  fi
+}
+
+function start_script() {
+  if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --yesno "Use Default Settings?\n\nDefaults are optimized for desktop usage:\n• 4 CPU Cores (Host model)\n• 8 GB RAM\n• 40 GB Disk\n• Q35 Machine Type" --no-button Advanced 14 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
+}
+
+# ==============================================================================
+# MAIN EXECUTION
+# ==============================================================================
+check_root
+arch_check
+pve_check
+ssh_check
+start_script
+post_to_api_vm
+
+# ==============================================================================
+# STORAGE SELECTION
+# ==============================================================================
+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
+    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}."
+
+# ==============================================================================
+# ISO DOWNLOAD
+# ==============================================================================
+msg_info "Retrieving the URL for the CachyOS Desktop ISO"
+
+# Get latest release version from SourceForge (format: YYMMDD in folder links)
+CACHYOS_VERSION=$(curl -fsSL "https://sourceforge.net/projects/cachyos-arch/files/gui-installer/desktop/" 2>/dev/null | grep -oP 'desktop/\K[0-9]{6}(?=/)' | sort -rn | head -1)
+if [ -z "$CACHYOS_VERSION" ]; then
+  CACHYOS_VERSION="260124"
+fi
+
+# SourceForge download URL with mirror redirect
+URL="https://sourceforge.net/projects/cachyos-arch/files/gui-installer/desktop/${CACHYOS_VERSION}/cachyos-desktop-linux-${CACHYOS_VERSION}.iso/download"
+FILENAME="cachyos-desktop-linux-${CACHYOS_VERSION}.iso"
+CACHE_DIR="/var/lib/vz/template/iso"
+CACHE_FILE="${CACHE_DIR}/${FILENAME}"
+
+mkdir -p "$CACHE_DIR"
+msg_ok "${CL}${BL}CachyOS Desktop ISO (Release: ${CACHYOS_VERSION})${CL}"
+
+if [[ -s "$CACHE_FILE" ]]; then
+  msg_ok "Using cached ISO ${CL}${BL}${FILENAME}${CL}"
+else
+  msg_info "Downloading CachyOS ISO (approximately 3.1 GB, this may take a while)"
+  if curl -fSL -o "$CACHE_FILE" -L "$URL"; then
+    echo -en "\e[1A\e[0K"
+    msg_ok "Downloaded ${CL}${BL}${FILENAME}${CL}"
+  else
+    msg_error "Failed to download CachyOS ISO"
+    exit 1
+  fi
+fi
+
+# ==============================================================================
+# VM CREATION
+# ==============================================================================
+msg_info "Creating a CachyOS VM"
+
+qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 0 -ostype l26 -scsihw virtio-scsi-pci \
+  -efidisk0 ${STORAGE}:1,efitype=4m,pre-enrolled-keys=0 -scsi0 ${STORAGE}:${DISK_SIZE},${DISK_CACHE}${THIN%,} \
+  -cdrom local:iso/${FILENAME} -vga qxl -serial0 socket >/dev/null
+
+msg_ok "Created a CachyOS VM ${CL}${BL}(${HN})"
+
+# ==============================================================================
+# VM DESCRIPTION
+# ==============================================================================
+DESCRIPTION=$(
+  cat <<EOF
+<div align='center'>
+  <a href='https://Helper-Scripts.com' 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;'>CachyOS VM</h2>
+
+  <p style='font-size: 14px; margin: 10px 0;'>
+    Performance-optimized Arch Linux with custom kernels,<br/>
+    BORE/EEVDF schedulers, and x86-64-v3/v4 optimizations.
+  </p>
+
+  <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='Buy us a coffee' />
+    </a>
+  </p>
+
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-globe fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://cachyos.org/' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>CachyOS Website</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-book fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://wiki.cachyos.org/' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>Wiki</a>
+  </span>
+  <span style='margin: 0 10px;'>
+    <i class="fa fa-github fa-fw" style="color: #f5f5f5;"></i>
+    <a href='https://github.com/CachyOS' target='_blank' rel='noopener noreferrer' style='text-decoration: none; color: #00617f;'>GitHub</a>
+  </span>
+</div>
+EOF
+)
+qm set "$VMID" -description "$DESCRIPTION" >/dev/null
+
+msg_ok "Created a CachyOS VM ${CL}${BL}(${HN})"
+
+# ==============================================================================
+# START VM
+# ==============================================================================
+if [ "$START_VM" == "yes" ]; then
+  msg_info "Starting CachyOS VM"
+  qm start $VMID
+  msg_ok "Started CachyOS VM"
+fi
+
+post_update_to_api "done" "none"
+
+# ==============================================================================
+# FINAL OUTPUT
+# ==============================================================================
+echo -e "\n${INFO}${BOLD}${GN}CachyOS VM Configuration Summary:${CL}"
+echo -e "${TAB}${DGN}VM ID: ${BGN}${VMID}${CL}"
+echo -e "${TAB}${DGN}Hostname: ${BGN}${HN}${CL}"
+echo -e "${TAB}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
+echo -e "${TAB}${DGN}RAM: ${BGN}${RAM_SIZE} MiB${CL}"
+echo -e "${TAB}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
+
+echo -e "\n${INFO}${BOLD}${YW}Next Steps:${CL}"
+echo -e "${TAB}1. Open the VM Console in Proxmox (noVNC or SPICE)"
+echo -e "${TAB}2. Boot from the CachyOS ISO"
+echo -e "${TAB}3. Use the Calamares installer to complete installation"
+echo -e "${TAB}4. Choose your preferred desktop environment during setup:"
+echo -e "${TAB}   ${BL}KDE Plasma, GNOME, XFCE, Hyprland, i3, and more${CL}"
+echo -e "${TAB}5. After installation, remove the ISO from VM settings"
+echo -e "${TAB}6. Change boot order to boot from disk (scsi0)"
+
+echo -e "\n${INFO}${BOLD}${GN}CachyOS Features:${CL}"
+echo -e "${TAB}• Custom linux-cachyos kernel with BORE scheduler"
+echo -e "${TAB}• x86-64-v3/v4 optimized packages (auto-detected)"
+echo -e "${TAB}• LTO/PGO optimized applications"
+echo -e "${TAB}• Multiple filesystem options: btrfs, ext4, xfs, f2fs, zfs"
+
+msg_ok "Completed successfully!\n"
diff --git a/vm/headers/cachyos-vm b/vm/headers/cachyos-vm
new file mode 100644
index 000000000..c27c985bc
--- /dev/null
+++ b/vm/headers/cachyos-vm
@@ -0,0 +1,8 @@
+   ______           __          ____  _____             
+  / ____/___ ______/ /_  __  __/ __ \/ ___/      _   ______ ___ 
+ / /   / __ `/ ___/ __ \/ / / / / / /\__ \______| | / / __ `__ \
+/ /___/ /_/ / /__/ / / / /_/ / /_/ /___/ /_____/| |/ / / / / / /
+\____/\__,_/\___/_/ /_/\__, /\____//____/       |___/_/ /_/ /_/ 
+                      /____/                                     
+       Performance-Optimized Arch Linux Distribution
+
diff --git a/vm/truenas-vm.sh b/vm/truenas-vm.sh
index 295dc6954..4eef6f398 100644
--- a/vm/truenas-vm.sh
+++ b/vm/truenas-vm.sh
@@ -182,7 +182,7 @@ function check_root() {
   fi
 }
 
-pve_check() {
+function pve_check() {
   local PVE_VER
   PVE_VER="$(pveversion | awk -F'/' '{print $2}' | awk -F'-' '{print $1}')"
 
@@ -273,6 +273,12 @@ function default_settings() {
 }
 
 function advanced_settings() {
+  DISK_SIZE="16"
+  HN="truenas"
+  CORE_COUNT="2"
+  RAM_SIZE="8192"
+  BRG="vmbr0"
+
   METHOD="advanced"
   [ -z "${VMID:-}" ] && VMID=$(get_valid_nextid)
   while true; do
@@ -293,16 +299,39 @@ function advanced_settings() {
   done
 
   ISOARRAY=()
-  while read -r ISOPATH; do
-    FILENAME=$(basename "$ISOPATH")
-    ISOARRAY+=("$ISOPATH" "$FILENAME" "OFF")
-  done < <(truenas_iso_lookup | sort -V)
-  if [ ${#ISOARRAY[@]} -eq 0 ]; then
+  mapfile -t ALL_ISOS < <(truenas_iso_lookup | sort -V)
+  ISO_COUNT=${#ALL_ISOS[@]}
+
+  if [ $ISO_COUNT -eq 0 ]; then
     echo "No ISOs found."
     exit 1
   fi
 
-  if SELECTED_ISO=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT ISO TO INSTALL" --notags --radiolist "\nSelect version (BETA/RC + Latest stables):" 20 58 12 "${ISOARRAY[@]}" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  # 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
@@ -320,9 +349,8 @@ function advanced_settings() {
     exit-script
   fi
 
-  if VM_NAME=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Hostname" 8 58 truenas --title "HOSTNAME" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  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
-      HN="truenas"
       echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}$HN${CL}"
     else
       HN=$(echo ${VM_NAME,,} | tr -d ' ')
@@ -350,7 +378,7 @@ function advanced_settings() {
     exit-script
   fi
 
-  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 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"
       echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}$CORE_COUNT${CL}"
@@ -361,7 +389,7 @@ function advanced_settings() {
     exit-script
   fi
 
-  if RAM_SIZE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Allocate RAM in MiB" 8 58 8192 --title "RAM" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  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"
       echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}$RAM_SIZE${CL}"
@@ -372,7 +400,7 @@ function advanced_settings() {
     exit-script
   fi
 
-  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 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}"
@@ -533,14 +561,14 @@ if [ "$IMPORT_DISKS" == "yes" ]; then
 
   while read -r LSOUTPUT; do
     DISKARRAY+=("$LSOUTPUT" "" "OFF")
-  done < <(ls /dev/disk/by-id | grep -E '^ata-|^nvme-' | grep -v 'part')
+  done < <(ls /dev/disk/by-id | grep -E '^ata-|^nvme-|^usb-' | grep -v 'part')
 
   SELECTIONS=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SELECT DISKS TO IMPORT" --checklist "\nSelect disk IDs to import. (Use Spacebar to select)\n" --cancel-button "Exit Script" 20 58 10 "${DISKARRAY[@]}" 3>&1 1>&2 2>&3 | tr -d '"') || exit
 
   for SELECTION in $SELECTIONS; do
     ((++SCSI_NR))
 
-    ID_SERIAL=$(echo "$SELECTION" | rev | cut -d'_' -f1 | rev)
+    ID_SERIAL=$(udevadm info --query=property --value --property=ID_SERIAL_SHORT "/dev/disk/by-id/$SELECTION")
     ID_SERIAL=${ID_SERIAL:0:20}
 
     qm set $VMID --scsi$SCSI_NR /dev/disk/by-id/$SELECTION,serial=$ID_SERIAL