Merge branch 'main' into AppImage_fix

Cleared the license field in the Cargo.toml for the Stirling-PDF desktop application. This may be to update or clarify the project's licensing information.

.github/config/repo_devs.json

@@ -13,8 +13,6 @@
     "reecebrowne",
     "DarioGii",
     "ConnorYoh",
-    "EthanHealy01",
-    "jbrunton96",
-    "balazs-szucs"
+    "EthanHealy01"
   ]
 }

.github/dependabot.yml

@@ -6,7 +6,7 @@
 version: 2
 updates:
   - package-ecosystem: "gradle" # See documentation for possible values
-    directories:
+    directories: 
       - "/" # Location of package manifests
       - "/app/common"
       - "/app/core"

.github/labeler-config-srvaroa.yml

@@ -63,6 +63,9 @@ labels:
     files:
       - 'app/core/src/main/resources/static/.*'
       - 'app/proprietary/src/main/resources/static/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*'
+      - 'app/core/src/main/java/stirling/software/SPDF/UI/.*'
+      - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*'
       - 'frontend/**'
       - 'frontend/.*'
       - 'frontend/**/.*'

.github/labels.yml

@@ -200,4 +200,4 @@
   from_name: "tauri"
 - name: "license-review-required"
   color: "EDEDED"
-  description: "This PR requires a license review"
+  description: "This PR requires a license review"

.github/scripts/check_language_toml.py

@@ -11,16 +11,13 @@ adjusting the format.
 Usage:
     python check_language_toml.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
 """
-
 # Sample for Windows:
 # python .github/scripts/check_language_toml.py --reference-file frontend/public/locales/en-GB/translation.toml --branch "" --files frontend/public/locales/de-DE/translation.toml frontend/public/locales/fr-FR/translation.toml
 
-import argparse
 import glob
 import os
+import argparse
 import re
-from pathlib import Path
-
 import tomllib  # Python 3.11+ (stdlib)
 import tomli_w  # For writing TOML files
 
@@ -39,8 +36,7 @@ def find_duplicate_keys(file_path, keys=None, prefix=""):
     duplicates = []
 
     # Load TOML file
-    file_path = Path(file_path)
-    with file_path.open("rb") as file:
+    with open(file_path, "rb") as file:
         data = tomllib.load(file)
 
     def process_dict(obj, current_prefix=""):
@@ -59,8 +55,8 @@ def find_duplicate_keys(file_path, keys=None, prefix=""):
     return duplicates
 
 
-# Maximum size for TOML files (e.g., 570 KB)
-MAX_FILE_SIZE = 570 * 1024
+# Maximum size for TOML files (e.g., 500 KB)
+MAX_FILE_SIZE = 500 * 1024
 
 
 def parse_toml_file(file_path):
@@ -69,8 +65,7 @@ def parse_toml_file(file_path):
     :param file_path: Path to the TOML file.
     :return: Dictionary with flattened keys.
     """
-    file_path = Path(file_path)
-    with file_path.open("rb") as file:
+    with open(file_path, "rb") as file:
         data = tomllib.load(file)
 
     def flatten_dict(d, parent_key="", sep="."):
@@ -113,8 +108,7 @@ def write_toml_file(file_path, updated_properties):
     """
     nested_data = unflatten_dict(updated_properties)
 
-    file_path = Path(file_path)
-    with file_path.open("wb") as file:
+    with open(file_path, "wb") as file:
         tomli_w.dump(nested_data, file)
 
 
@@ -125,23 +119,18 @@ def update_missing_keys(reference_file, file_list, branch=""):
     :param file_list: List of translation files to update.
     :param branch: Branch where the files are located.
     """
-    reference_file = Path(reference_file)
     reference_properties = parse_toml_file(reference_file)
-    branch_path = Path(branch) if branch else Path()
 
     for file_path in file_list:
-        file_path = Path(file_path)
-        language_dir = file_path.parent.name
-        reference_lang_dir = reference_file.parent.name
+        basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
-            language_dir == reference_lang_dir
-            or file_path.suffix != ".toml"
-            or file_path.parents[1].name != "locales"
+            basename_current_file == os.path.basename(reference_file)
+            or not file_path.endswith(".toml")
+            or not os.path.dirname(file_path).endswith("locales")
         ):
-            print(f"Skipping file: {file_path}")
             continue
 
-        current_properties = parse_toml_file(branch_path / file_path)
+        current_properties = parse_toml_file(os.path.join(branch, file_path))
         updated_properties = {}
 
         for ref_key, ref_value in reference_properties.items():
@@ -152,7 +141,7 @@ def update_missing_keys(reference_file, file_list, branch=""):
                 # Add missing key with reference value
                 updated_properties[ref_key] = ref_value
 
-        write_toml_file(branch_path / file_path, updated_properties)
+        write_toml_file(os.path.join(branch, file_path), updated_properties)
 
 
 def check_for_missing_keys(reference_file, file_list, branch):
@@ -160,17 +149,14 @@ def check_for_missing_keys(reference_file, file_list, branch):
 
 
 def read_toml_keys(file_path):
-    file_path = Path(file_path)
-    if file_path.is_file():
+    if os.path.isfile(file_path) and os.path.exists(file_path):
         return parse_toml_file(file_path)
     return {}
 
 
 def check_for_differences(reference_file, file_list, branch, actor):
     reference_branch = branch
-    reference_file = Path(reference_file)
-    basename_reference_file = reference_file.name
-    branch_path = Path(branch) if branch else Path()
+    basename_reference_file = os.path.basename(reference_file)
 
     report = []
     report.append(f"#### 🔄 Reference Branch: `{reference_branch}`")
@@ -184,44 +170,39 @@ def check_for_differences(reference_file, file_list, branch, actor):
     if len(file_list) == 1:
         file_arr = file_list[0].split()
 
-    base_dir = Path.cwd() / "frontend" / "public" / "locales"
+    base_dir = os.path.abspath(
+        os.path.join(os.getcwd(), "frontend", "public", "locales")
+    )
 
     for file_path in file_arr:
-        file_path = Path(file_path)
-        file_normpath = file_path
-        absolute_path = file_normpath.resolve()
-
-        basename_current_file = (branch_path / file_normpath).name
-        locale_dir = file_normpath.parent.name
-        report.append(f"#### 📃 **File Check:** `{locale_dir}/{basename_current_file}`")
+        file_normpath = os.path.normpath(file_path)
+        absolute_path = os.path.abspath(file_normpath)
 
         # Verify that file is within the expected directory
-        if not absolute_path.is_relative_to(base_dir):
-            has_differences = True
-            report.append(
-                f"\n⚠️ Unsafe file found: `{locale_dir}/{basename_current_file}`\n\n---\n"
-            )
-            continue
+        if not absolute_path.startswith(base_dir):
+            raise ValueError(f"Unsafe file found: {file_normpath}")
 
         # Verify file size before processing
-        if (branch_path / file_normpath).stat().st_size > MAX_FILE_SIZE:
-            has_differences = True
-            report.append(
-                f"\n⚠️ The file `{locale_dir}/{basename_current_file}` is too large and could pose a security risk.\n\n---\n"
+        if os.path.getsize(os.path.join(branch, file_normpath)) > MAX_FILE_SIZE:
+            raise ValueError(
+                f"The file {file_normpath} is too large and could pose a security risk."
             )
-            continue
+
+        basename_current_file = os.path.basename(os.path.join(branch, file_normpath))
+        locale_dir = os.path.basename(os.path.dirname(file_normpath))
 
         if basename_current_file == basename_reference_file and locale_dir == "en-GB":
             continue
 
         if (
-            file_normpath.suffix != ".toml"
+            not file_normpath.endswith(".toml")
             or basename_current_file != "translation.toml"
         ):
             continue
 
         only_reference_file = False
-        current_keys = read_toml_keys(branch_path / file_path)
+        report.append(f"#### 📃 **File Check:** `{locale_dir}/{basename_current_file}`")
+        current_keys = read_toml_keys(os.path.join(branch, file_path))
         reference_key_count = len(reference_keys)
         current_key_count = len(current_keys)
 
@@ -266,13 +247,13 @@ def check_for_differences(reference_file, file_list, branch, actor):
         else:
             report.append("2. **Test Status:** ✅ **_Passed_**")
 
-        if find_duplicate_keys(branch_path / file_normpath):
+        if find_duplicate_keys(os.path.join(branch, file_normpath)):
             has_differences = True
             output = "\n".join(
                 [
                     f"      - `{key}`: first at {first}, duplicate at `{duplicate}`"
                     for key, first, duplicate in find_duplicate_keys(
-                        branch_path / file_normpath
+                        os.path.join(branch, file_normpath)
                     )
                 ]
             )

.github/workflows/PR-Auto-Deploy-V2.yml

@@ -11,10 +11,6 @@ on:
       allow_fork:
         description: "Allow deploying fork PR?"
         required: false
-        type: choice
-        options:
-          - "true"
-          - "false"
         default: "false"
 
 permissions:
@@ -35,7 +31,7 @@ jobs:
       pr_ref: ${{ steps.resolve.outputs.ref }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
@@ -46,7 +42,7 @@ jobs:
           script: |
             const { owner, repo } = context.repo;
             let prNumber = context.eventName === 'workflow_dispatch'
-              ? parseInt(context.payload.inputs.pr, 10)
+              ? parseInt(process.env.INPUT_PR, 10)
               : context.payload.number;
 
             if (!Number.isInteger(prNumber)) { core.setFailed('Invalid PR number'); return; }
@@ -111,12 +107,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
       - name: Checkout main repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: ${{ github.repository }}
           ref: main
@@ -172,7 +168,7 @@ jobs:
             return newComment.id;
 
       - name: Checkout PR
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: ${{ needs.check-pr.outputs.pr_repository }}
           ref: ${{ needs.check-pr.outputs.pr_ref }}
@@ -180,7 +176,7 @@ jobs:
           fetch-depth: 0 # Fetch full history for commit hash detection
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Get version number
         id: versionNumber
@@ -189,56 +185,93 @@ jobs:
           echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
 
-      - name: Get commit hash for app
-        id: commit-hash
+      - name: Get commit hashes for frontend and backend
+        id: commit-hashes
         run: |
-          # Get last commit that touched the application code
-          APP_HASH=$(git log -1 --format="%H" -- . 2>/dev/null || echo "")
-          if [ -z "$APP_HASH" ]; then
-            APP_HASH="no-changes"
+          # Get last commit that touched the frontend folder, docker/frontend, or docker/compose
+          FRONTEND_HASH=$(git log -1 --format="%H" -- frontend/ docker/frontend/ docker/compose/ 2>/dev/null || echo "")
+          if [ -z "$FRONTEND_HASH" ]; then
+            FRONTEND_HASH="no-frontend-changes"
           fi
 
-          echo "App hash: $APP_HASH"
-          echo "app_hash=$APP_HASH" >> $GITHUB_OUTPUT
+          # Get last commit that touched backend code, docker/backend, or docker/compose
+          BACKEND_HASH=$(git log -1 --format="%H" -- app/ docker/backend/ docker/compose/ 2>/dev/null || echo "")
+          if [ -z "$BACKEND_HASH" ]; then
+            BACKEND_HASH="no-backend-changes"
+          fi
 
-          # Short hash for tags
-          if [ "$APP_HASH" = "no-changes" ]; then
-            echo "app_short=no-changes" >> $GITHUB_OUTPUT
+          echo "Frontend hash: $FRONTEND_HASH"
+          echo "Backend hash: $BACKEND_HASH"
+
+          echo "frontend_hash=$FRONTEND_HASH" >> $GITHUB_OUTPUT
+          echo "backend_hash=$BACKEND_HASH" >> $GITHUB_OUTPUT
+
+          # Short hashes for tags
+          if [ "$FRONTEND_HASH" = "no-frontend-changes" ]; then
+            echo "frontend_short=no-frontend" >> $GITHUB_OUTPUT
           else
-            echo "app_short=${APP_HASH:0:8}" >> $GITHUB_OUTPUT
+            echo "frontend_short=${FRONTEND_HASH:0:8}" >> $GITHUB_OUTPUT
           fi
 
-      - name: Check if image exists
-        id: check-image
+          if [ "$BACKEND_HASH" = "no-backend-changes" ]; then
+            echo "backend_short=no-backend" >> $GITHUB_OUTPUT
+          else
+            echo "backend_short=${BACKEND_HASH:0:8}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check if frontend image exists
+        id: check-frontend
         run: |
-          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-${{ steps.commit-hash.outputs.app_short }} >/dev/null 2>&1; then
+          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }} >/dev/null 2>&1; then
             echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Image already exists, skipping build"
+            echo "Frontend image already exists, skipping build"
           else
             echo "exists=false" >> $GITHUB_OUTPUT
-            echo "Image needs to be built"
+            echo "Frontend image needs to be built"
           fi
 
-      - name: Build and push V2 image
-        if: steps.check-image.outputs.exists == 'false'
+      - name: Check if backend image exists
+        id: check-backend
+        run: |
+          if docker manifest inspect ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }} >/dev/null 2>&1; then
+            echo "exists=true" >> $GITHUB_OUTPUT
+            echo "Backend image already exists, skipping build"
+          else
+            echo "exists=false" >> $GITHUB_OUTPUT
+            echo "Backend image needs to be built"
+          fi
+
+      - name: Build and push V2 frontend image
+        if: steps.check-frontend.outputs.exists == 'false'
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           context: .
-          file: ./docker/embedded/Dockerfile
+          file: ./docker/frontend/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-${{ steps.commit-hash.outputs.app_short }}
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
+          build-args: VERSION_TAG=v2-alpha
+          platforms: linux/amd64
+
+      - name: Build and push V2 backend image
+        if: steps.check-backend.outputs.exists == 'false'
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        with:
+          context: .
+          file: ./docker/backend/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
           build-args: VERSION_TAG=v2-alpha
           platforms: linux/amd64
 
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Deploy V2 to VPS
@@ -246,16 +279,17 @@ jobs:
         run: |
           # Use same port strategy as regular PRs - just the PR number
           V2_PORT=${{ needs.check-pr.outputs.pr_number }}
+          BACKEND_PORT=$((V2_PORT + 10000))  # Backend on higher port to avoid conflicts
 
-          # Create docker-compose for V2 with unified embedded image
+          # Create docker-compose for V2 with separate frontend and backend
           cat > docker-compose.yml << EOF
           version: '3.3'
           services:
-            stirling-pdf-v2:
-              container_name: stirling-pdf-v2-pr-${{ needs.check-pr.outputs.pr_number }}
-              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-${{ steps.commit-hash.outputs.app_short }}
+            stirling-pdf-v2-backend:
+              container_name: stirling-pdf-v2-backend-pr-${{ needs.check-pr.outputs.pr_number }}
+              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-backend-${{ steps.commit-hashes.outputs.backend_short }}
               ports:
-                - "${V2_PORT}:8080"
+                - "${BACKEND_PORT}:8080"    # Backend API port
               volumes:
                 - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/data:/usr/share/tessdata:rw
                 - /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/config:/configs:rw
@@ -267,7 +301,7 @@ jobs:
                 SECURITY_INITIALLOGIN_PASSWORD: "${{ secrets.TEST_LOGIN_PASSWORD }}"
                 SYSTEM_DEFAULTLOCALE: en-GB
                 UI_APPNAME: "Stirling-PDF V2 PR#${{ needs.check-pr.outputs.pr_number }}"
-                UI_HOMEDESCRIPTION: "V2 PR#${{ needs.check-pr.outputs.pr_number }} - Embedded Architecture"
+                UI_HOMEDESCRIPTION: "V2 PR#${{ needs.check-pr.outputs.pr_number }} - Frontend/Backend Split Architecture"
                 UI_APPNAMENAVBAR: "V2 PR#${{ needs.check-pr.outputs.pr_number }}"
                 SYSTEM_MAXFILESIZE: "100"
                 METRICS_ENABLED: "true"
@@ -275,12 +309,23 @@ jobs:
                 SWAGGER_SERVER_URL: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
                 baseUrl: "https://${V2_PORT}.ssl.stirlingpdf.cloud"
               restart: on-failure:5
+
+            stirling-pdf-v2-frontend:
+              container_name: stirling-pdf-v2-frontend-pr-${{ needs.check-pr.outputs.pr_number }}
+              image: ${{ secrets.DOCKER_HUB_USERNAME }}/test:v2-frontend-${{ steps.commit-hashes.outputs.frontend_short }}
+              ports:
+                - "${V2_PORT}:80"          # Frontend port (same as regular PRs)
+              environment:
+                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:${BACKEND_PORT}"
+              depends_on:
+                - stirling-pdf-v2-backend
+              restart: on-failure:5
           EOF
 
           # Deploy to VPS
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }}:/tmp/docker-compose-v2.yml
+          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose-v2.yml
 
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << ENDSSH
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
             # Create V2 PR-specific directories
             mkdir -p /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}/{data,config,logs}
 
@@ -290,15 +335,15 @@ jobs:
             # Stop any existing container and clean up
             cd /stirling/V2-PR-${{ needs.check-pr.outputs.pr_number }}
             docker-compose down --remove-orphans 2>/dev/null || true
-
+            
             # Start the new container
             docker-compose pull
             docker-compose up -d
-
+            
             # Clean up unused Docker resources to save space
             docker system prune -af --volumes || true
 
-            # Clean up old images (older than 2 weeks)
+            # Clean up old backend/frontend images (older than 2 weeks)
             docker image prune -af --filter "until=336h" --filter "label!=keep=true" || true
           ENDSSH
 
@@ -330,11 +375,11 @@ jobs:
               }
             }
 
-            const deploymentUrl = `http://${{ secrets.NEW_VPS_HOST }}:${v2Port}`;
+            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${v2Port}`;
             const httpsUrl = `https://${v2Port}.ssl.stirlingpdf.cloud`;
 
             const commentBody = `## 🚀 V2 Auto-Deployment Complete!\n\n` +
-                              `Your V2 PR with embedded architecture has been deployed!\n\n` +
+                              `Your V2 PR with the new frontend/backend split architecture has been deployed!\n\n` +
                               `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
                               `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
                               `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
@@ -357,12 +402,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup GitHub App Bot
         if: github.actor != 'dependabot[bot]'
@@ -405,12 +450,12 @@ jobs:
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Cleanup V2 deployment
         run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << 'ENDSSH'
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
             if [ -d "/stirling/V2-PR-${{ github.event.pull_request.number }}" ]; then
               echo "Found V2 PR directory, proceeding with cleanup..."
 
@@ -424,8 +469,9 @@ jobs:
               # Remove V2 PR-specific directories
               rm -rf /stirling/V2-PR-${{ github.event.pull_request.number }}
 
-              # Clean up V2 container by name (in case compose cleanup missed it)
-              docker rm -f stirling-pdf-v2-pr-${{ github.event.pull_request.number }} || true
+              # Clean up V2 containers by name (in case compose cleanup missed them)
+              docker rm -f stirling-pdf-v2-frontend-pr-${{ github.event.pull_request.number }} || true
+              docker rm -f stirling-pdf-v2-backend-pr-${{ github.event.pull_request.number }} || true
 
               echo "V2 cleanup completed"
             else

.github/workflows/PR-Demo-Comment-with-react.yml

@@ -25,7 +25,8 @@ jobs:
         github.event.comment.user.login == 'frooodle' ||
         github.event.comment.user.login == 'sf298' ||
         github.event.comment.user.login == 'Ludy87' ||
-        github.event.comment.user.login == 'balazs-szucs' ||
+        github.event.comment.user.login == 'LaserKaspar' ||
+        github.event.comment.user.login == 'sbplat' ||
         github.event.comment.user.login == 'reecebrowne' ||
         github.event.comment.user.login == 'DarioGii' ||
         github.event.comment.user.login == 'EthanHealy01' ||
@@ -40,12 +41,12 @@ jobs:
       enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout PR
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         if: github.actor != 'dependabot[bot]'
@@ -128,12 +129,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout PR
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         if: github.actor != 'dependabot[bot]'
@@ -145,7 +146,7 @@ jobs:
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
 
       - name: Checkout PR
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           ref: refs/pull/${{ needs.check-comment.outputs.pr_number }}/merge
           token: ${{ steps.setup-bot.outputs.token }}
@@ -153,14 +154,9 @@ jobs:
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
-          java-version: "21"
+          java-version: "17"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Run Gradle Command
         run: |
           if [ "${{ needs.check-comment.outputs.disable_security }}" == "true" ]; then
@@ -168,15 +164,12 @@ jobs:
           else
             export DISABLE_ADDITIONAL_FEATURES=false
           fi
-          ./gradlew build
+          ./gradlew clean build
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to Docker Hub
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
@@ -197,7 +190,7 @@ jobs:
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Deploy to VPS
@@ -259,9 +252,9 @@ jobs:
           EOF
 
           # Then copy the file and execute commands
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }}:/tmp/docker-compose.yml
+          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
 
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << ENDSSH
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
             # Create PR-specific directories
             mkdir -p /stirling/PR-${{ needs.check-comment.outputs.pr_number }}/{data,config,logs}
 
@@ -343,7 +336,7 @@ jobs:
             const prNumber = ${{ needs.check-comment.outputs.pr_number }};
             const securityStatus = process.env.security_status || "Security Disabled";
 
-            const deploymentUrl = `http://${{ secrets.NEW_VPS_HOST }}:${prNumber}`;
+            const deploymentUrl = `http://${{ secrets.VPS_HOST }}:${prNumber}`;
             const commentBody = `## 🚀 PR Test Deployment\n\n` +
                               `Your PR has been deployed for testing!\n\n` +
                               `🔗 **Test URL:** [${deploymentUrl}](${deploymentUrl})\n` +
@@ -370,12 +363,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Check out the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         id: setup-bot

.github/workflows/PR-Demo-cleanup.yml

@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 env:
-  SERVER_IP: ${{ secrets.NEW_VPS_IP }} # Add this to your GitHub secrets
+  SERVER_IP: ${{ secrets.VPS_IP }} # Add this to your GitHub secrets
   CLEANUP_PERFORMED: "false" # Add flag to track if cleanup occurred
 
 jobs:
@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout PR
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         if: github.actor != 'dependabot[bot]'
@@ -100,14 +100,14 @@ jobs:
         if: steps.remove-label-comment.outputs.present == 'true'
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Cleanup PR deployment
         if: steps.remove-label-comment.outputs.present == 'true'
         id: cleanup
         run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << 'ENDSSH'
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -T ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << 'ENDSSH'
             if [ -d "/stirling/PR-${{ github.event.pull_request.number }}" ]; then
               echo "Found PR directory, proceeding with cleanup..."
 

.github/workflows/ai_pr_title_review.yml

@@ -19,11 +19,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
 

.github/workflows/auto-labelerV2.yml

@@ -16,11 +16,11 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         id: setup-bot

.github/workflows/build.yml

@@ -32,11 +32,11 @@ jobs:
       frontend: ${{ steps.changes.outputs.frontend }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -56,11 +56,11 @@ jobs:
         spring-security: [true, false]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK ${{ matrix.jdk-version }}
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -68,17 +68,9 @@ jobs:
           java-version: ${{ matrix.jdk-version }}
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: ./gradlew build -PnoSpotless
+        run: ./gradlew clean build -PnoSpotless
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
 
       - name: Check Test Reports Exist
@@ -105,7 +97,6 @@ jobs:
         with:
           name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
           path: |
-            app/**/build/reports/jacoco/test
             app/**/build/reports/tests/
             app/**/build/test-results/
             app/**/build/reports/problems/
@@ -113,29 +104,18 @@ jobs:
           retention-days: 3
           if-no-files-found: warn
 
-      - name: Add coverage to PR with spring security ${{ matrix.spring-security }} and JDK ${{ matrix.jdk-version }}
-        id: jacoco
-        uses: madrapps/jacoco-report@50d3aff4548aa991e6753342d9ba291084e63848 # v1.7.2
-        with:
-          paths: |
-            ${{ github.workspace }}/**/build/reports/jacoco/test/jacocoTestReport.xml
-          token: ${{ secrets.GITHUB_TOKEN }}
-          min-coverage-overall: 10
-          min-coverage-changed-files: 0
-          comment-type: summary
-
   check-generateOpenApiDocs:
     if: needs.files-changed.outputs.openapi == 'true'
     needs: [files-changed]
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -143,17 +123,9 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Generate OpenAPI documentation
         run: ./gradlew :stirling-pdf:generateOpenApiDocs
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
 
       - name: Upload OpenAPI Documentation
@@ -168,11 +140,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Set up Node.js
         uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
@@ -202,12 +174,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -215,17 +187,8 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: check the licenses for compatibility
-        run: ./gradlew checkLicense
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
+        run: ./gradlew clean checkLicense
 
       - name: FAILED - check the licenses for compatibility
         if: failure()
@@ -256,12 +219,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
 
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -269,13 +232,8 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Install Docker Compose
         run: |
@@ -299,10 +257,6 @@ jobs:
           chmod +x ./testing/test.sh
           chmod +x ./testing/test_disabledEndpoints.sh
           ./testing/test.sh
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
 
   test-build-docker-images:
     if: github.event_name == 'pull_request' && needs.files-changed.outputs.project == 'true'
@@ -320,12 +274,12 @@ jobs:
             artifact-suffix: Dockerfile.fat
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
 
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Free disk space on runner
         run: |
@@ -340,26 +294,18 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Build application
-        run: ./gradlew build
+        run: ./gradlew clean build
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Build ${{ matrix.docker-rev }}
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
@@ -368,8 +314,8 @@ jobs:
           context: .
           file: ./${{ matrix.docker-rev }}
           push: false
-          cache-from: type=gha,scope=${{ matrix.artifact-suffix }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.artifact-suffix }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64/v8
           provenance: true
           sbom: true

.github/workflows/check_toml.yml

@@ -7,8 +7,6 @@ on:
     types: [opened, synchronize, reopened]
     paths:
       - "frontend/public/locales/*/translation.toml"
-      - ".github/scripts/check_language_toml.py"
-      - ".github/workflows/check_toml.yml"
 
 # cancel in-progress jobs if a new job is triggered
 concurrency:
@@ -27,12 +25,12 @@ jobs:
       pull-requests: write # Allow writing to pull requests
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout main branch first
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         id: setup-bot

.github/workflows/dependency-review.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: "Checkout Repository"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: "Dependency Review"
         uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
         with:

.github/workflows/deploy-on-v2-commit.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Get commit hashes for frontend and backend
         id: commit-hashes
@@ -119,7 +119,7 @@ jobs:
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           chmod 600 ../private.key
 
       - name: Deploy to VPS on port 3000
@@ -158,17 +158,17 @@ jobs:
               ports:
                 - "3000:80"
               environment:
-                VITE_API_BASE_URL: "http://${{ secrets.NEW_VPS_HOST }}:13000"
+                VITE_API_BASE_URL: "http://${{ secrets.VPS_HOST }}:13000"
               depends_on:
                 - backend
               restart: on-failure:5
           EOF
 
           # Copy to remote with unique name
-          scp -i ../private.key -o StrictHostKeyChecking=no $UNIQUE_NAME ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }}:/tmp/$UNIQUE_NAME
+          scp -i ../private.key -o StrictHostKeyChecking=no $UNIQUE_NAME ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/$UNIQUE_NAME
 
           # SSH and rename/move atomically to avoid interference
-          ssh -i ../private.key -o StrictHostKeyChecking=no ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << ENDSSH
+          ssh -i ../private.key -o StrictHostKeyChecking=no ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << ENDSSH
             mkdir -p /stirling/V2/{data,config,logs}
             mv /tmp/$UNIQUE_NAME /stirling/V2/docker-compose.yml
             cd /stirling/V2

.github/workflows/frontend-backend-licenses-update.yml

@@ -25,12 +25,12 @@ jobs:
       licenses-backend: ${{ steps.changes.outputs.licenses-backend }}
     steps:
       - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -49,12 +49,12 @@ jobs:
       repository-projects: write # Required for enabling automerge
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout PR head (default)
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -69,7 +69,7 @@ jobs:
 
       - name: Checkout BASE branch (safe script)
         if: github.event_name == 'pull_request'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           ref: ${{ github.event.pull_request.base.sha }}
           path: base
@@ -312,12 +312,12 @@ jobs:
       repository-projects: write # Required for enabling automerge
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -336,19 +336,11 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Check licenses and generate report
         id: license-check
         run: |
-          ./gradlew checkLicense generateLicenseReport || echo "LICENSE_CHECK_FAILED=true" >> $GITHUB_ENV
+          ./gradlew clean checkLicense generateLicenseReport || echo "LICENSE_CHECK_FAILED=true" >> $GITHUB_ENV
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: false
           STIRLING_PDF_DESKTOP_UI: true
 

.github/workflows/manage-label.yml

@@ -15,12 +15,12 @@ jobs:
       issues: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Check out the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Run Labeler
         uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0

.github/workflows/multiOSReleases.yml

@@ -26,6 +26,18 @@ on:
   release:
     types: [created]
 
+# cancel in-progress jobs if a new job is triggered
+# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
+# or a pull request is updated.
+# It helps to save resources and time by ensuring that only the latest commit is built and tested
+# This is particularly useful for long-running jobs that may take a while to complete.
+# The `group` is set to a combination of the workflow name, event name, and branch name.
+# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
+# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -38,11 +50,11 @@ jobs:
       version: ${{ steps.versionNumber.outputs.versionNumber }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -50,8 +62,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           gradle-version: 8.14
 
@@ -63,10 +74,6 @@ jobs:
           VERSION=$(./gradlew printVersion --quiet | tail -1)
           echo "Extracted version: $VERSION"
           echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
 
       - name: Determine build matrix
         id: set-matrix
@@ -80,15 +87,15 @@ jobs:
                 echo 'matrix={"include":[{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"}]}' >> $GITHUB_OUTPUT
                 ;;
               "linux")
-                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
                 ;;
               *)
-                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
                 ;;
             esac
           else
             # For push/release events, build all platforms
-            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
           fi
 
   build-jars:
@@ -111,11 +118,11 @@ jobs:
             file_suffix: "-server"
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -123,8 +130,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           gradle-version: 8.14
 
@@ -137,11 +143,8 @@ jobs:
           cache-dependency-path: frontend/package-lock.json
 
       - name: Build JAR
-        run: ./gradlew build ${{ matrix.variant.build_frontend && '-PbuildWithFrontend=true' || '' }} -x spotlessApply -x spotlessCheck -x test -x sonarqube
+        run: ./gradlew clean build ${{ matrix.variant.build_frontend && '-PbuildWithFrontend=true' || '' }} -x spotlessApply -x spotlessCheck -x test -x sonarqube
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: ${{ matrix.variant.disable_security }}
           STIRLING_PDF_DESKTOP_UI: false
 
@@ -171,18 +174,68 @@ jobs:
       WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name != 'linux-x86_64-appimage'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libjavascriptcoregtk-4.0-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev libsoup-3.0-dev
+          # Dependencies explanation:
+          # - libwebkit2gtk-4.1-dev: WebKit engine for Tauri v2 (4.0 was for v1)
+          # - libappindicator3-dev: System tray support
+          # - librsvg2-dev: SVG rendering
+          # - patchelf: Required for AppImage packaging
+          # - libxdo-dev: Keyboard/mouse automation
+          # - libasound2-dev: Audio support
+          # - libopenblas-dev: GPU acceleration support
+          # - libx11-dev: X11 development files for window system interaction
+          # - libxtst-dev: X11 testing extensions for input simulation
+          # - libxrandr-dev: X11 RandR extension for display configuration
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libxdo-dev libasound2-dev libopenblas-dev libx11-dev libxtst-dev libxrandr-dev
+
+      - name: Install macOS DMG tooling
+        if: startsWith(matrix.platform, 'macos')
+        run: |
+          brew list create-dmg >/dev/null 2>&1 || brew install create-dmg
+
+      - name: Install dependencies (appimage only)
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          sudo apt-get update
+
+          sudo apt-get install -y \
+            build-essential \
+            curl \
+            wget \
+            file \
+            libgtk-3-dev \
+            libxdo-dev \
+            libssl-dev \
+            libappindicator3-dev \
+            librsvg2-dev \
+            openjdk-17-jre-headless \
+            patchelf
+            
+          mkdir -p /tmp/ubuntu-packages
+          cd /tmp/ubuntu-packages
+          wget https://launchpadlibrarian.net/723972773/libwebkit2gtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libwebkit2gtk-4.1-0"; exit 1; }
+          wget https://launchpadlibrarian.net/723972761/libwebkit2gtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libwebkit2gtk-4.1-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/723972770/libjavascriptcoregtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libjavascriptcoregtk-4.1-0"; exit 1; }
+          wget https://launchpadlibrarian.net/723972746/libjavascriptcoregtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libjavascriptcoregtk-4.1-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/723972735/gir1.2-javascriptcoregtk-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download gir1.2-javascriptcoregtk-4.1"; exit 1; }
+          wget https://launchpadlibrarian.net/723972739/gir1.2-webkit2-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download gir1.2-webkit2-4.1"; exit 1; }
+          wget https://launchpadlibrarian.net/606433947/libicu70_70.1-2ubuntu1_amd64.deb || { echo "Failed to download libicu70"; exit 1; }
+          wget https://launchpadlibrarian.net/606433941/libicu-dev_70.1-2ubuntu1_amd64.deb || { echo "Failed to download libicu-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/606433945/icu-devtools_70.1-2ubuntu1_amd64.deb || { echo "Failed to download icu-devtools"; exit 1; }
+          wget https://launchpadlibrarian.net/595623693/libjpeg8_8c-2ubuntu10_amd64.deb || { echo "Failed to download libjpeg8"; exit 1; }
+          wget https://launchpadlibrarian.net/587202140/libjpeg-turbo8_2.1.2-0ubuntu1_amd64.deb || { echo "Failed to download libjpeg-turbo8"; exit 1; }
+          wget https://launchpadlibrarian.net/592959859/xdg-desktop-portal-gtk_1.14.0-1build1_amd64.deb || { echo "Failed to download xdg-desktop-portal-gtk"; exit 1; }
+          sudo apt-get install -y /tmp/ubuntu-packages/*.deb
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -203,18 +256,13 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Build Java backend with JLink
         working-directory: ./
         shell: bash
         run: |
           chmod +x ./gradlew
           echo "🔧 Building Stirling-PDF JAR..."
-          ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+          ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
 
           # Find the built JAR
           STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
@@ -278,14 +326,11 @@ jobs:
           RUNTIME_SIZE=$(du -sh ./frontend/src-tauri/runtime/jre | cut -f1)
           echo "📊 Custom JRE size: $RUNTIME_SIZE"
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
 
       - name: Install frontend dependencies
         working-directory: ./frontend
-        run: npm ci
+        run: npm install
 
       # DigiCert KeyLocker Setup (Cloud HSM)
       - name: Setup DigiCert KeyLocker
@@ -398,6 +443,35 @@ jobs:
           echo "APPLE_SIGNING_IDENTITY=$CERT_ID" >> $GITHUB_ENV
           echo "Certificate imported successfully."
 
+      - name: Check DMG creation dependencies (macOS only)
+        if: matrix.platform == 'macos-15' || matrix.platform == 'macos-15-intel'
+        run: |
+          echo "🔍 Checking DMG creation dependencies on ${{ matrix.platform }}..."
+          echo "hdiutil version: $(hdiutil --version || echo 'NOT FOUND')"
+          echo "create-dmg availability: $(which create-dmg || echo 'NOT FOUND')"
+          echo "Available disk space: $(df -h /tmp | tail -1)"
+          echo "macOS version: $(sw_vers -productVersion)"
+          echo "Available tools:"
+          ls -la /usr/bin/hd* || echo "No hd* tools found"
+
+      - name: Generate temporary GPG key for AppImage
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          cat >keyparams <<EOF
+          %no-protection
+          Key-Type: RSA
+          Key-Length: 2048
+          Name-Real: CI AppImage Signer
+          Name-Email: ci-appimage@example.invalid
+          Expire-Date: 0
+          %commit
+          EOF
+          gpg --batch --generate-key keyparams
+          export GPG_FINGERPRINT=$(gpg --batch --with-colons --list-secret-keys | awk -F: '/^fpr:/ {print $10; exit}')
+          echo "GPG_FINGERPRINT=$GPG_FINGERPRINT" >> $GITHUB_ENV
+          echo "Generated temporary GPG key:"
+          gpg --list-secret-keys --keyid-format=long
+
       - name: Build Tauri app
         uses: tauri-apps/tauri-action@v0
         env:
@@ -421,6 +495,15 @@ jobs:
           tauriScript: npx tauri
           args: ${{ matrix.args }}
 
+      - name: Cleanup temporary GPG key
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          if [ -n "${GPG_FINGERPRINT:-}" ]; then
+            gpg --batch --yes --delete-secret-keys "$GPG_FINGERPRINT" || true
+            gpg --batch --yes --delete-keys "$GPG_FINGERPRINT" || true
+          fi
+          rm -f keyparams
+
       # Sign with DigiCert KeyLocker (post-build)
       - name: Sign Windows binaries with DigiCert KeyLocker
         if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && (github.event_name == 'release' || github.ref == 'refs/heads/V2-master') }}
@@ -526,10 +609,13 @@ jobs:
             find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
           elif [ "${{ matrix.platform }}" = "macos-15" ] || [ "${{ matrix.platform }}" = "macos-15-intel" ]; then
             find . -name "*.dmg" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.dmg" \;
-            find . -name "*.app" -exec cp -r {} "../../../dist/Stirling-PDF-${{ matrix.name }}.app" \;
-          else
+            # find . -name "*.app" -exec cp -r {} "../../../dist/Stirling-PDF-${{ matrix.name }}.app" \;
+          elif [ "${{ matrix.platform }}" = "ubuntu-22.04" ]; then
             find . -name "*.deb" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.deb" \;
+            find . -name "*.rpm" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.rpm" \;
             find . -name "*.AppImage" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.AppImage" \;
+          else
+            echo "Unknown platform: ${{ matrix.platform }}"
           fi
 
       - name: Upload build artifacts
@@ -547,30 +633,30 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Download all Tauri artifacts
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           pattern: Stirling-PDF-*
           path: ./artifacts/tauri
 
       - name: Download JAR artifact (default)
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: jar
           path: ./artifacts/jars
 
       - name: Download JAR artifact (with login)
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: jar-with-login
           path: ./artifacts/jars
 
       - name: Download JAR artifact (server only)
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: jar-server
           path: ./artifacts/jars
@@ -584,10 +670,11 @@ jobs:
           tag_name: v${{ needs.determine-matrix.outputs.version }}
           generate_release_notes: true
           files: |
-            ./artifacts/**/*.jar
-            ./artifacts/**/*.msi
-            ./artifacts/**/*.dmg
-            ./artifacts/**/*.deb
-            ./artifacts/**/*.AppImage
+            ./artifacts/**/Stirling-PDF-*.jar
+            ./artifacts/**/Stirling-PDF-*.msi
+            ./artifacts/**/Stirling-PDF-*.dmg
+            ./artifacts/**/Stirling-PDF-*.deb
+            ./artifacts/**/Stirling-PDF-*.rpm
+            ./artifacts/**/Stirling-PDF-*.AppImage
           draft: false
           prerelease: false

.github/workflows/pre_commit.yml

@@ -21,12 +21,12 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
 
@@ -57,17 +57,8 @@ jobs:
           java-version: 21
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
-
       - name: Build with Gradle
-        run: ./gradlew build
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
+        run: ./gradlew clean build
 
       - name: git add
         run: |

.github/workflows/push-docker.yml

@@ -33,11 +33,11 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -45,28 +45,17 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
         with:
           gradle-version: 8.14
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Get version number
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
-
-      - name: Install cosign
-        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2-master'
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
-        with:
-          cosign-release: "v2.4.1"
 
       - name: Install cosign
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/V2-master'

.github/workflows/scorecards.yml

@@ -35,12 +35,12 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -75,6 +75,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
+        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 

.github/workflows/swagger.yml

@@ -27,11 +27,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -39,10 +39,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
 
       - name: Generate Swagger documentation
         run: ./gradlew :stirling-pdf:generateOpenApiDocs
@@ -50,19 +47,12 @@ jobs:
       - name: Upload Swagger Documentation to SwaggerHub
         run: ./gradlew swaggerhubUpload
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           SWAGGERHUB_API_KEY: ${{ secrets.SWAGGERHUB_API_KEY }}
           SWAGGERHUB_USER: "Frooodle"
 
       - name: Get version number
         id: versionNumber
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
 
       - name: Set API version as published and default on SwaggerHub
         run: |

.github/workflows/sync_files_v2.yml

@@ -7,9 +7,6 @@ on:
       - main
     paths:
       - "build.gradle"
-      - "app/common/build.gradle"
-      - "app/core/build.gradle"
-      - "app/proprietary/build.gradle"
       - "README.md"
       - "frontend/public/locales/*/translation.toml"
       - "app/core/src/main/resources/static/3rdPartyLicenses.json"
@@ -35,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Setup GitHub App Bot
         id: setup-bot

.github/workflows/tauri-build.yml

@@ -23,6 +23,18 @@ on:
   push:
     branches: [main]
 
+# cancel in-progress jobs if a new job is triggered
+# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
+# or a pull request is updated.
+# It helps to save resources and time by ensuring that only the latest commit is built and tested
+# This is particularly useful for long-running jobs that may take a while to complete.
+# The `group` is set to a combination of the workflow name, event name, and branch name.
+# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
+# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -33,6 +45,11 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        with:
+          egress-policy: audit
+
       - name: Determine build matrix
         id: set-matrix
         run: |
@@ -45,15 +62,15 @@ jobs:
                 echo 'matrix={"include":[{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"}]}' >> $GITHUB_OUTPUT
                 ;;
               "linux")
-                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
                 ;;
               *)
-                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+                echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
                 ;;
             esac
           else
             # For PR/push events, build all platforms
-            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"","name":"linux-x86_64"}]}' >> $GITHUB_OUTPUT
+            echo 'matrix={"include":[{"platform":"windows-latest","args":"--target x86_64-pc-windows-msvc","name":"windows-x86_64"},{"platform":"macos-15","args":"--target aarch64-apple-darwin","name":"macos-aarch64"},{"platform":"macos-15-intel","args":"--target x86_64-apple-darwin","name":"macos-x86_64"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b appimage","name":"linux-x86_64-appimage"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b deb","name":"linux-x86_64-deb"},{"platform":"ubuntu-22.04","args":"--target x86_64-unknown-linux-gnu -b rpm","name":"linux-x86_64-rpm"}]}' >> $GITHUB_OUTPUT
           fi
 
   build:
@@ -67,18 +84,68 @@ jobs:
       WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
+      - name: install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name != 'linux-x86_64-appimage'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libjavascriptcoregtk-4.0-dev libsoup2.4-dev libjavascriptcoregtk-4.1-dev libsoup-3.0-dev
+          # Dependencies explanation:
+          # - libwebkit2gtk-4.1-dev: WebKit engine for Tauri v2 (4.0 was for v1)
+          # - libappindicator3-dev: System tray support
+          # - librsvg2-dev: SVG rendering
+          # - patchelf: Required for AppImage packaging
+          # - libxdo-dev: Keyboard/mouse automation
+          # - libasound2-dev: Audio support
+          # - libopenblas-dev: GPU acceleration support
+          # - libx11-dev: X11 development files for window system interaction
+          # - libxtst-dev: X11 testing extensions for input simulation
+          # - libxrandr-dev: X11 RandR extension for display configuration
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libxdo-dev libasound2-dev libopenblas-dev libx11-dev libxtst-dev libxrandr-dev
+
+      - name: Install macOS DMG tooling
+        if: startsWith(matrix.platform, 'macos')
+        run: |
+          brew list create-dmg >/dev/null 2>&1 || brew install create-dmg
+
+      - name: Install dependencies (appimage only)
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          sudo apt-get update
+
+          sudo apt-get install -y \
+            build-essential \
+            curl \
+            wget \
+            file \
+            libgtk-3-dev \
+            libxdo-dev \
+            libssl-dev \
+            libappindicator3-dev \
+            librsvg2-dev \
+            openjdk-17-jre-headless \
+            patchelf
+            
+          mkdir -p /tmp/ubuntu-packages
+          cd /tmp/ubuntu-packages
+          wget https://launchpadlibrarian.net/723972773/libwebkit2gtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libwebkit2gtk-4.1-0"; exit 1; }
+          wget https://launchpadlibrarian.net/723972761/libwebkit2gtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libwebkit2gtk-4.1-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/723972770/libjavascriptcoregtk-4.1-0_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libjavascriptcoregtk-4.1-0"; exit 1; }
+          wget https://launchpadlibrarian.net/723972746/libjavascriptcoregtk-4.1-dev_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download libjavascriptcoregtk-4.1-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/723972735/gir1.2-javascriptcoregtk-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download gir1.2-javascriptcoregtk-4.1"; exit 1; }
+          wget https://launchpadlibrarian.net/723972739/gir1.2-webkit2-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb || { echo "Failed to download gir1.2-webkit2-4.1"; exit 1; }
+          wget https://launchpadlibrarian.net/606433947/libicu70_70.1-2ubuntu1_amd64.deb || { echo "Failed to download libicu70"; exit 1; }
+          wget https://launchpadlibrarian.net/606433941/libicu-dev_70.1-2ubuntu1_amd64.deb || { echo "Failed to download libicu-dev"; exit 1; }
+          wget https://launchpadlibrarian.net/606433945/icu-devtools_70.1-2ubuntu1_amd64.deb || { echo "Failed to download icu-devtools"; exit 1; }
+          wget https://launchpadlibrarian.net/595623693/libjpeg8_8c-2ubuntu10_amd64.deb || { echo "Failed to download libjpeg8"; exit 1; }
+          wget https://launchpadlibrarian.net/587202140/libjpeg-turbo8_2.1.2-0ubuntu1_amd64.deb || { echo "Failed to download libjpeg-turbo8"; exit 1; }
+          wget https://launchpadlibrarian.net/592959859/xdg-desktop-portal-gtk_1.14.0-1build1_amd64.deb || { echo "Failed to download xdg-desktop-portal-gtk"; exit 1; }
+          sudo apt-get install -y /tmp/ubuntu-packages/*.deb
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -99,10 +166,17 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
-        with:
-          gradle-version: 8.14
+      - name: Make libjvm discoverable (appimage only)
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          JAVA_LIBJVM="$JAVA_HOME/lib/server/libjvm.so"
+          if [ -f "$JAVA_LIBJVM" ]; then
+            sudo ln -sf "$JAVA_LIBJVM" /usr/lib/libjvm.so
+            echo "Linked libjvm from $JAVA_LIBJVM"
+          else
+            echo "libjvm not found at $JAVA_LIBJVM"
+            exit 1
+          fi
 
       - name: Build Java backend with JLink
         working-directory: ./
@@ -110,8 +184,8 @@ jobs:
         run: |
           chmod +x ./gradlew
           echo "🔧 Building Stirling-PDF JAR..."
-          # STIRLING_PDF_DESKTOP_UI=false ./gradlew bootJar --no-daemon
-          ./gradlew build -x spotlessApply -x spotlessCheck -x test -x sonarqube
+          # STIRLING_PDF_DESKTOP_UI=false ./gradlew clean bootJar --no-daemon
+          ./gradlew clean build -x spotlessApply -x spotlessCheck -x test -x sonarqube
 
           # Find the built JAR
           STIRLING_JAR=$(ls app/core/build/libs/stirling-pdf-*.jar | head -n 1)
@@ -175,9 +249,6 @@ jobs:
           RUNTIME_SIZE=$(du -sh ./frontend/src-tauri/runtime/jre | cut -f1)
           echo "📊 Custom JRE size: $RUNTIME_SIZE"
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
 
       - name: Install frontend dependencies
@@ -306,6 +377,24 @@ jobs:
           echo "Available tools:"
           ls -la /usr/bin/hd* || echo "No hd* tools found"
 
+      - name: Generate temporary GPG key for AppImage
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          cat >keyparams <<EOF
+          %no-protection
+          Key-Type: RSA
+          Key-Length: 2048
+          Name-Real: CI AppImage Signer
+          Name-Email: ci-appimage@example.invalid
+          Expire-Date: 0
+          %commit
+          EOF
+          gpg --batch --generate-key keyparams
+          export GPG_FINGERPRINT=$(gpg --batch --with-colons --list-secret-keys | awk -F: '/^fpr:/ {print $10; exit}')
+          echo "GPG_FINGERPRINT=$GPG_FINGERPRINT" >> $GITHUB_ENV
+          echo "Generated temporary GPG key:"
+          gpg --list-secret-keys --keyid-format=long
+
       - name: Build Tauri app
         uses: tauri-apps/tauri-action@v0
         env:
@@ -316,19 +405,33 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.APPIMAGETOOL_SIGN_PASSPHRASE }}
+          # APPIMAGETOOL_SIGN_PASSPHRASE: ${{ secrets.APPIMAGETOOL_SIGN_PASSPHRASE }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
           VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY: ${{ secrets.VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY }}
           VITE_SAAS_SERVER_URL: ${{ secrets.VITE_SAAS_SERVER_URL }}
-          # Only enable Windows signing in Tauri when on main
-          SIGN: ${{ github.ref == 'refs/heads/main' && (env.SM_API_KEY == '' && env.WINDOWS_CERTIFICATE != '') && '1' || '0' }}
+          # Enable Windows signing only when ALL of the following are true:
+          #   - The build is running on the Windows platform (matrix.platform == 'windows-latest')
+          #   - The build is triggered from the main branch (github.ref == 'refs/heads/main')
+          #   - The DigiCert KeyLocker HSM is NOT being used (env.SM_API_KEY == '')
+          #   - A Windows certificate is available (env.WINDOWS_CERTIFICATE != '')
+          # If all conditions are met, SIGN=1 (enable signing); otherwise, SIGN=0 (disable signing).
+          SIGN: ${{ (matrix.platform == 'windows-latest' && github.ref == 'refs/heads/main' && env.SM_API_KEY == '' && env.WINDOWS_CERTIFICATE != '') && '1' || '0' }}
           CI: true
         with:
           projectPath: ./frontend
           tauriScript: npx tauri
           args: ${{ matrix.args }}
 
+      - name: Cleanup temporary GPG key
+        if: matrix.platform == 'ubuntu-22.04' && matrix.name == 'linux-x86_64-appimage'
+        run: |
+          if [ -n "${GPG_FINGERPRINT:-}" ]; then
+            gpg --batch --yes --delete-secret-keys "$GPG_FINGERPRINT" || true
+            gpg --batch --yes --delete-keys "$GPG_FINGERPRINT" || true
+          fi
+          rm -f keyparams
+
       # Sign with DigiCert KeyLocker (post-build)
       - name: Sign Windows binaries with DigiCert KeyLocker
         if: ${{ matrix.platform == 'windows-latest' && env.SM_API_KEY != '' && github.ref == 'refs/heads/main' }}
@@ -515,9 +618,13 @@ jobs:
             find . -name "*.msi" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.msi" \;
           elif [ "${{ matrix.platform }}" = "macos-15" ] || [ "${{ matrix.platform }}" = "macos-15-intel" ]; then
             find . -name "*.dmg" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.dmg" \;
-          else
+            # find . -name "*.app" -exec cp -r {} "../../../dist/Stirling-PDF-${{ matrix.name }}.app" \;
+          elif [ "${{ matrix.platform }}" = "ubuntu-22.04" ]; then
             find . -name "*.deb" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.deb" \;
+            find . -name "*.rpm" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.rpm" \;
             find . -name "*.AppImage" -exec cp {} "../../../dist/Stirling-PDF-${{ matrix.name }}.AppImage" \;
+          else
+            echo "Unknown platform: ${{ matrix.platform }}"
           fi
 
       - name: Verify Windows Code Signature
@@ -607,13 +714,16 @@ jobs:
               echo "❌ No macOS artifacts found"
               exit 1
             fi
-          else
+          elif [ "${{ matrix.platform }}" = "ubuntu-22.04" ]; then
             echo "Checking for Linux artifacts..."
-            find . -name "*.deb" -o -name "*.AppImage" | head -5
-            if [ $(find . -name "*.deb" -o -name "*.AppImage" | wc -l) -eq 0 ]; then
+            find . -name "*.deb" -o -name "*.AppImage" -o -name "*.rpm" | head -5
+            if [ $(find . -name "*.deb" -o -name "*.AppImage" -o -name "*.rpm" | wc -l) -eq 0 ]; then
               echo "❌ No Linux artifacts found"
               exit 1
             fi
+          else
+            echo "Unknown platform: ${{ matrix.platform }}"
+            exit 1
           fi
 
           echo "✅ Build artifacts found for ${{ matrix.name }}"
@@ -623,7 +733,7 @@ jobs:
         run: |
           cd ./frontend/src-tauri/target
           echo "Artifact sizes for ${{ matrix.name }}:"
-          find . -name "*.exe" -o -name "*.dmg" -o -name "*.deb" -o -name "*.AppImage" -o -name "*.msi" | while read file; do
+          find . -name "*.exe" -o -name "*.dmg" -o -name "*.deb" -o -name "*.AppImage"  -o -name "*.rpm" -o -name "*.msi" | while read file; do
             if [ -f "$file" ]; then
               size=$(stat -c%s "$file" 2>/dev/null || stat -f%z "$file" 2>/dev/null || echo "unknown")
               echo "$file: $size bytes"

.github/workflows/testdriver.yml

@@ -25,12 +25,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
@@ -44,15 +44,12 @@ jobs:
           gradle-version: 8.14
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew clean build
         env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_PUBLIC_URL: ${{ secrets.MAVEN_PUBLIC_URL }}
           DISABLE_ADDITIONAL_FEATURES: true
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Get version number
         id: versionNumber
@@ -79,7 +76,7 @@ jobs:
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Deploy to VPS
@@ -110,9 +107,9 @@ jobs:
               restart: on-failure:5
           EOF
 
-          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }}:/tmp/docker-compose.yml
+          scp -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null docker-compose.yml ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }}:/tmp/docker-compose.yml
 
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << EOF
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
             mkdir -p /stirling/test-${{ github.sha }}/{data,config,logs}
             mv /tmp/docker-compose.yml /stirling/test-${{ github.sha }}/docker-compose.yml
             cd /stirling/test-${{ github.sha }}
@@ -128,7 +125,7 @@ jobs:
     outputs:
       frontend: ${{ steps.changes.outputs.frontend }}
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -143,11 +140,11 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
@@ -164,7 +161,7 @@ jobs:
             npm install
             npm run build
             npm install dashcam-chrome --save
-            Start-Process "C:/Program Files/Google/Chrome/Application/chrome.exe" -ArgumentList "--start-maximized", "--load-extension=$(pwd)/node_modules/dashcam-chrome/build", "http://${{ secrets.NEW_VPS_HOST }}:1337"
+            Start-Process "C:/Program Files/Google/Chrome/Application/chrome.exe" -ArgumentList "--start-maximized", "--load-extension=$(pwd)/node_modules/dashcam-chrome/build", "http://${{ secrets.VPS_HOST }}:1337"
             Start-Sleep -Seconds 20
           prompt: |
             1. /run testing/testdriver/test.yml
@@ -179,20 +176,20 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit
 
       - name: Set up SSH
         run: |
           mkdir -p ~/.ssh/
-          echo "${{ secrets.NEW_VPS_SSH_KEY }}" > ../private.key
+          echo "${{ secrets.VPS_SSH_KEY }}" > ../private.key
           sudo chmod 600 ../private.key
 
       - name: Cleanup deployment
         if: always()
         run: |
-          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.NEW_VPS_USERNAME }}@${{ secrets.NEW_VPS_HOST }} << EOF
+          ssh -i ../private.key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${{ secrets.VPS_USERNAME }}@${{ secrets.VPS_HOST }} << EOF
             cd /stirling/test-${{ github.sha }}
             docker-compose down
             cd /stirling

.gitignore

@@ -213,7 +213,7 @@ id_ed25519.pub
 .mypy_cache
 .pytest_cache
 .ipynb_checkpoints
-.build-cache
+
 
 
 **/jcef-bundle/

ADDING_TOOLS.md

@@ -1,6 +1,6 @@
 # Adding New React Tools to Stirling PDF
 
-This guide covers how to add new PDF tools to the React frontend.
+This guide covers how to add new PDF tools to the React frontend, either by migrating existing Thymeleaf templates or creating entirely new tools.
 
 ## Overview
 
@@ -188,7 +188,7 @@ import { use[ToolName]Tips } from "../components/tooltips/use[ToolName]Tips";
 
 const [ToolName] = (props: BaseToolProps) => {
   const tips = use[ToolName]Tips();
-
+  
   // In your steps array:
   steps: [
     {
@@ -257,14 +257,22 @@ Update translation files. **Important: Only update `en-GB` files** - other langu
 - Add `options.*` keys if your tool has settings with descriptions
 
 **Tooltip Writing Guidelines:**
-- **Use simple, everyday language** - avoid technical terms like "converts interactive elements"
+- **Use simple, everyday language** - avoid technical terms like "converts interactive elements" 
 - **Focus on benefits** - explain what the user gains, not how it works internally
 - **Use concrete examples** - "text boxes become regular text" vs "form fields are flattened"
 - **Answer user questions** - "What does this do?", "When should I use this?", "What's this option for?"
 - **Keep descriptions concise** - 1-2 sentences maximum per section
 - **Use bullet points** for multiple benefits or features
 
-## 6. Testing Your Tool
+## 6. Migration from Thymeleaf
+When migrating existing Thymeleaf templates:
+
+1. **Identify Form Parameters**: Look at the original `<form>` inputs to determine parameter structure
+2. **Extract Translation Keys**: Find `#{key.name}` references and add them to JSON translations (For many tools these translations will already exist but some parts will be missing)
+3. **Map API Endpoint**: Note the `th:action` URL for the operation hook
+4. **Preserve Functionality**: Ensure all original form behaviour is replicated which is applicable to V2 react UI
+
+## 7. Testing Your Tool
 - Verify tool appears in UI with correct icon and description
 - Test with various file sizes and types
 - Confirm translations work

CLAUDE.md

@@ -128,8 +128,8 @@ return useToolOperation({
 ## Architecture Overview
 
 ### Project Structure
-- **Backend**: Spring Boot application
-- **Frontend**: React-based SPA in `/frontend` directory
+- **Backend**: Spring Boot application with Thymeleaf templating
+- **Frontend**: React-based SPA in `/frontend` directory (Thymeleaf templates fully replaced)
   - **File Storage**: IndexedDB for client-side file persistence and thumbnails
   - **Internationalization**: JSON-based translations (converted from backend .properties)
 - **PDF Processing**: PDFBox for core PDF operations, LibreOffice for conversions, PDF.js for client-side rendering
@@ -140,6 +140,8 @@ return useToolOperation({
 - **API Controllers** (`src/main/java/.../controller/api/`): REST endpoints for PDF operations
   - Organized by function: converters, security, misc, pipeline
   - Follow pattern: `@RestController` + `@RequestMapping("/api/v1/...")`
+- **Web Controllers** (`src/main/java/.../controller/web/`): Serve Thymeleaf templates
+  - Pattern: `@Controller` + return template names
 
 ### Key Components
 - **SPDFApplication.java**: Main application class with desktop UI and browser launching logic
@@ -199,6 +201,7 @@ return useToolOperation({
 
 - **Java Version**: Minimum JDK 17, supports and recommends JDK 21
 - **Lombok**: Used extensively - ensure IDE plugin is installed
+- **Desktop Mode**: Set `STIRLING_PDF_DESKTOP_UI=true` for desktop application mode
 - **File Persistence**:
   - **Backend**: Designed to be stateless - files are processed in memory/temp locations only
   - **Frontend**: Uses IndexedDB for client-side file storage and caching (with thumbnails)

DeveloperGuide.md

@@ -2,7 +2,7 @@
 
 ## 1. Introduction
 
-Stirling-PDF is a robust, locally hosted, web-based PDF manipulation tool. **Stirling 2.0** represents a complete frontend rewrite with a modern React SPA (Single Page Application).
+Stirling-PDF is a robust, locally hosted, web-based PDF manipulation tool. **Stirling 2.0** represents a complete frontend rewrite, replacing the legacy Thymeleaf-based UI with a modern React SPA (Single Page Application).
 
 This guide focuses on developing for Stirling 2.0, including both the React frontend and Spring Boot backend development workflows.
 
@@ -38,6 +38,9 @@ This guide focuses on developing for Stirling 2.0, including both the React fron
 - PDF file association support
 - Self-contained JRE bundling with JLink
 
+**Legacy (reference only during development):**
+- Thymeleaf templates (being completely replaced in 2.0)
+
 ## 3. Development Environment Setup
 
 ### Prerequisites
@@ -97,6 +100,9 @@ Stirling 2.0 uses client-side file storage:
 - **PDF.js**: Handles client-side PDF rendering and processing
 - **URL Parameters**: Support for deep linking and tool state persistence
 
+### Legacy Code Reference
+The existing Thymeleaf templates remain in the codebase during development as reference material but will be completely removed for the 2.0 release.
+
 ### Tauri Desktop App Development
 Stirling-PDF can be packaged as a cross-platform desktop application using Tauri with PDF file association support and bundled JRE.
 See [the frontend README](frontend/README.md#tauri) for build instructions.
@@ -148,6 +154,7 @@ Stirling-PDF/
 │   │       │   ├── css/
 │   │       │   ├── js/
 │   │       │   └── pdfjs/
+│   │       └── templates/         # Legacy Thymeleaf templates (reference only)
 │   └── test/
 ├── testing/               # Cucumber and integration tests
 │   └── cucumber/          # Cucumber test files
@@ -302,6 +309,7 @@ For quick iterations and development of Java backend, JavaScript, and UI compone
 - RESTful API endpoints
 - JavaScript functionality
 - User interface components and styling
+- Thymeleaf templates
 
 To run Stirling-PDF locally:
 
@@ -393,7 +401,7 @@ Remember to test your changes thoroughly to ensure they don't break any existing
 
 ### React Component Development (Stirling 2.0)
 
-For Stirling 2.0, new features are built as React components:
+For Stirling 2.0, new features are built as React components instead of Thymeleaf templates:
 
 #### Creating a New Tool Component
 
@@ -440,6 +448,61 @@ For Stirling 2.0, new features are built as React components:
 3. **Register in Tool Picker:**
    Update the tool picker component to include the new tool with proper routing and URL parameter support.
 
+### Legacy Reference: Overview of Thymeleaf
+
+Thymeleaf is a server-side Java HTML template engine. It is used in Stirling-PDF to render dynamic web pages. Thymeleaf integrates heavily with Spring Boot.
+
+### Thymeleaf overview
+
+In Stirling-PDF, Thymeleaf is used to create HTML templates that are rendered on the server side. These templates are located in the `stirling-pdf/src/main/resources/templates` directory. Thymeleaf templates use a combination of HTML and special Thymeleaf attributes to dynamically generate content.
+
+Some examples of this are:
+
+```html
+<th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+```
+or
+```html
+<th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+```
+
+Where it uses the `th:block`, `th:` indicating it's a special Thymeleaf element to be used server-side in generating the HTML, and block being the actual element type.
+In this case, we are inserting the `navbar` entry within the `fragments/navbar.html` fragment into the `th:block` element.
+
+They can be more complex, such as:
+
+```html
+<th:block th:insert="~{fragments/common :: head(title=#{pageExtracter.title}, header=#{pageExtracter.header})}"></th:block>
+```
+
+Which is the same as above but passes the parameters title and header into the fragment `common.html` to be used in its HTML generation.
+
+Thymeleaf can also be used to loop through objects or pass things from the Java side into the HTML side.
+
+```java
+ @GetMapping
+       public String newFeaturePage(Model model) {
+           model.addAttribute("exampleData", exampleData);
+           return "new-feature";
+       }
+```
+
+In the above example, if exampleData is a list of plain java objects of class Person and within it, you had id, name, age, etc. You can reference it like so
+
+```html
+<tbody>
+   <!-- Use th:each to iterate over the list -->
+   <tr th:each="person : ${exampleData}">
+       <td th:text="${person.id}"></td>
+       <td th:text="${person.name}"></td>
+       <td th:text="${person.age}"></td>
+       <td th:text="${person.email}"></td>
+   </tr>
+</tbody>
+```
+
+This would generate n entries of tr for each person in exampleData
+
 ### Adding a New Feature to the Backend (API)
 
 1. **Create a New Controller:**
@@ -464,7 +527,7 @@ For Stirling 2.0, new features are built as React components:
        @GetMapping
        @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
        public String newFeature() {
-           return "NewFeatureResponse";
+           return "NewFeatureResponse"; // This refers to the NewFeatureResponse.html template presenting the user with the generated html from that file when they navigate to /api/v1/new-feature
        }
    }
    ```
@@ -519,6 +582,91 @@ For Stirling 2.0, new features are built as React components:
   }
   ```
 
+### Adding a New Feature to the Frontend (UI)
+
+1. **Create a New Thymeleaf Template:**
+   - Create a new HTML file in the `stirling-pdf/src/main/resources/templates` directory.
+   - Use Thymeleaf attributes to dynamically generate content.
+   - Use `extract-page.html` as a base example for the HTML template, which is useful to ensure importing of the general layout, navbar, and footer.
+
+   ```html
+   <!DOCTYPE html>
+   <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
+     <head>
+     <th:block th:insert="~{fragments/common :: head(title=#{newFeature.title}, header=#{newFeature.header})}"></th:block>
+     </head>
+
+     <body>
+       <div id="page-container">
+         <div id="content-wrap">
+           <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+           <br><br>
+           <div class="container">
+             <div class="row justify-content-center">
+               <div class="col-md-6 bg-card">
+                 <div class="tool-header">
+                   <span class="material-symbols-rounded tool-header-icon organize">upload</span>
+                   <span class="tool-header-text" th:text="#{newFeature.header}"></span>
+                 </div>
+                 <form th:action="@{'/api/v1/new-feature'}" method="post" enctype="multipart/form-data">
+                   <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                   <input type="hidden" id="customMode" name="customMode" value="">
+                   <div class="mb-3">
+                     <label for="featureInput" th:text="#{newFeature.prompt}"></label>
+                     <input type="text" class="form-control" id="featureInput" name="featureInput" th:placeholder="#{newFeature.placeholder}" required>
+                   </div>
+
+                   <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{newFeature.submit}"></button>
+                 </form>
+               </div>
+             </div>
+           </div>
+         </div>
+         <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+       </div>
+     </body>
+   </html>
+   ```
+
+2. **Create a New Controller for the UI:**
+   - Create a new Java class in the `stirling-pdf/src/main/java/stirling/software/SPDF/controller/ui` directory.
+   - Annotate the class with `@Controller` and `@RequestMapping` to define the UI endpoint.
+
+   ```java
+   package stirling.software.SPDF.controller.ui;
+
+   import org.springframework.beans.factory.annotation.Autowired;
+   import org.springframework.stereotype.Controller;
+   import org.springframework.ui.Model;
+   import org.springframework.web.bind.annotation.GetMapping;
+   import org.springframework.web.bind.annotation.RequestMapping;
+   import stirling.software.SPDF.service.NewFeatureService;
+
+   @Controller
+   @RequestMapping("/new-feature")
+   public class NewFeatureUIController {
+
+       @Autowired
+       private NewFeatureService newFeatureService;
+
+       @GetMapping
+       public String newFeaturePage(Model model) {
+           model.addAttribute("newFeatureData", newFeatureService.getNewFeatureData());
+           return "new-feature";
+       }
+   }
+   ```
+
+3. **Update the Navigation Bar:**
+   - Add a link to the new feature page in the navigation bar.
+   - Update the `stirling-pdf/src/main/resources/templates/fragments/navbar.html` file.
+
+   ```html
+   <li class="nav-item">
+       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
+   </li>
+   ```
+
 ## Adding New Translations to Existing Language Files in Stirling-PDF
 
 When adding a new feature or modifying existing ones in Stirling-PDF, you'll need to add new translation entries to the existing language files. Here's a step-by-step guide:
@@ -548,4 +696,15 @@ pdfSplitter.input.pages=Enter page numbers to split
 
 Add these entries to the default GB language file and any others you wish, translating the values as appropriate for each language.
 
+### 3. Use Translations in Thymeleaf Templates
+
+In your Thymeleaf templates, use the `#{key}` syntax to reference the new translations:
+
+```html
+<h1 th:text="#{pdfSplitter.title}">PDF Splitter</h1>
+<p th:text="#{pdfSplitter.description}">Split your PDF into multiple documents</p>
+<input type="text" th:placeholder="#{pdfSplitter.input.pages}">
+<button th:text="#{pdfSplitter.button.split}">Split PDF</button>
+```
+
 Remember, never hard-code text in your templates or Java code. Always use translation keys to ensure proper localization.

app/common/build.gradle

@@ -29,6 +29,7 @@ spotless {
 dependencies {
     api 'org.springframework.boot:spring-boot-starter-web'
     api 'org.springframework.boot:spring-boot-starter-aop'
+    // api 'org.springframework.boot:spring-boot-starter-thymeleaf' // Deprecated - UI moved to React frontend
     api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
     api 'com.fathzer:javaluator:3.0.6'
     api 'com.posthog.java:posthog:1.2.0'
@@ -41,11 +42,8 @@ dependencies {
     api "org.apache.pdfbox:preflight:$pdfboxVersion"
     api 'com.github.junrar:junrar:7.5.7' // RAR archive support for CBR files
     api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
-    api 'org.snakeyaml:snakeyaml-engine:3.0.1'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.15"
-    // Simple Java Mail for EML/MSG parsing (replaces direct Angus Mail usage)
-    api 'org.simplejavamail:simple-java-mail:8.12.6'
-    api 'org.simplejavamail:outlook-module:8.12.6' // MSG file support
+    api 'org.snakeyaml:snakeyaml-engine:2.10'
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14"
     api 'jakarta.mail:jakarta.mail-api:2.1.5'
     runtimeOnly 'org.eclipse.angus:angus-mail:2.0.5'
 }

app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -516,8 +516,6 @@ public class EndpointConfiguration {
         addEndpointAlternative("compress-pdf", "qpdf");
         addEndpointAlternative("compress-pdf", "Ghostscript");
         addEndpointAlternative("compress-pdf", "Java");
-        addEndpointAlternative("crop", "Ghostscript");
-        addEndpointAlternative("crop", "Java");
         addEndpointAlternative("ocr-pdf", "tesseract");
         addEndpointAlternative("ocr-pdf", "OCRmyPDF");
 

app/common/src/main/java/stirling/software/common/configuration/AppConfig.java

@@ -64,6 +64,16 @@ public class AppConfig {
         return v2Enabled;
     }
 
+    /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete
+    @Bean
+    @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true")
+    public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) {
+        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
+        templateEngine.addTemplateResolver(new FileFallbackTemplateResolver(resourceLoader));
+        return templateEngine;
+    }
+    */
+
     @Bean(name = "loginEnabled")
     public boolean loginEnabled() {
         return applicationProperties.getSecurity().isEnableLogin();

app/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java

@@ -0,0 +1,49 @@
+package stirling.software.common.configuration;
+
+/* Commented out entire FileFallbackTemplateResolver class - Thymeleaf dependency removed
+ * This class will be removed when frontend migration to React is complete
+
+
+@Slf4j
+public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
+
+    private final ResourceLoader resourceLoader;
+
+    public FileFallbackTemplateResolver(ResourceLoader resourceLoader) {
+        super();
+        this.resourceLoader = resourceLoader;
+        setSuffix(".html");
+    }
+
+    // Note this does not work in local IDE, Prod jar only.
+    @Override
+    protected ITemplateResource computeTemplateResource(
+            IEngineConfiguration configuration,
+            String ownerTemplate,
+            String template,
+            String resourceName,
+            String characterEncoding,
+            Map<String, Object> templateResolutionAttributes) {
+        Resource resource =
+                resourceLoader.getResource(
+                        "file:" + InstallationPathConfig.getTemplatesPath() + resourceName);
+        try {
+            if (resource.exists() && resource.isReadable()) {
+                return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
+            }
+        } catch (IOException e) {
+            // Log the exception to help with debugging issues loading external templates
+            log.warn("Unable to read template '{}' from file system", resourceName, e);
+        }
+
+        InputStream inputStream =
+                Thread.currentThread()
+                        .getContextClassLoader()
+                        .getResourceAsStream("templates/" + resourceName);
+        if (inputStream != null) {
+            return new InputStreamTemplateResource(inputStream, "UTF-8");
+        }
+        return null;
+    }
+}
+*/

app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java

@@ -1,6 +1,8 @@
 package stirling.software.common.configuration;
 
 import java.io.File;
+import java.nio.file.Paths;
+import java.util.Locale;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -59,6 +61,28 @@ public class InstallationPathConfig {
     }
 
     private static String initializeBasePath() {
+        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
+            String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
+            if (os.contains("win")) {
+                return Paths.get(
+                                System.getenv("APPDATA"), // parent path
+                                "Stirling-PDF")
+                        + File.separator;
+            } else if (os.contains("mac")) {
+                return Paths.get(
+                                System.getProperty("user.home"),
+                                "Library",
+                                "Application Support",
+                                "Stirling-PDF")
+                        + File.separator;
+            } else {
+                return Paths.get(
+                                System.getProperty("user.home"), // parent path
+                                ".config",
+                                "Stirling-PDF")
+                        + File.separator;
+            }
+        }
         return "." + File.separator;
     }
 

app/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java

@@ -2,9 +2,6 @@ package stirling.software.common.configuration;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;
@@ -17,8 +14,6 @@ import stirling.software.common.model.ApplicationProperties.CustomPaths;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Operations;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Pipeline;
 import stirling.software.common.model.ApplicationProperties.System;
-import stirling.software.common.util.ProcessExecutor;
-import stirling.software.common.util.UnoServerPool;
 
 @Slf4j
 @Configuration
@@ -37,8 +32,6 @@ public class RuntimePathConfig {
     // Tesseract data path
     private final String tessDataPath;
 
-    private final List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> unoServerEndpoints;
-
     // Pipeline paths
     private final String pipelineWatchedFoldersPath;
     private final String pipelineFinishedFoldersPath;
@@ -101,28 +94,17 @@ public class RuntimePathConfig {
                         defaultSOfficePath, operations != null ? operations.getSoffice() : null);
 
         // Initialize Tesseract data path
-        // Priority: config setting > TESSDATA_PREFIX env var > default path
+        String defaultTessDataPath =
+                isDocker ? "/usr/share/tesseract-ocr/5/tessdata" : "/usr/share/tessdata";
+
         String tessPath = system.getTessdataDir();
-        String tessdataPrefix = java.lang.System.getenv("TESSDATA_PREFIX");
-        String defaultPath = "/usr/share/tesseract-ocr/5/tessdata";
-
-        if (tessPath != null && !tessPath.isEmpty()) {
-            this.tessDataPath = tessPath;
-        } else if (tessdataPrefix != null && !tessdataPrefix.isEmpty()) {
-            this.tessDataPath = tessdataPrefix;
-        } else {
-            this.tessDataPath = defaultPath;
-        }
+        String tessdataDir = java.lang.System.getenv("TESSDATA_PREFIX");
 
+        this.tessDataPath =
+                resolvePath(
+                        defaultTessDataPath,
+                        (tessPath != null && !tessPath.isEmpty()) ? tessPath : tessdataDir);
         log.info("Using Tesseract data path: {}", this.tessDataPath);
-
-        ApplicationProperties.ProcessExecutor processExecutor = properties.getProcessExecutor();
-        int libreOfficeLimit = 1;
-        if (processExecutor != null && processExecutor.getSessionLimit() != null) {
-            libreOfficeLimit = processExecutor.getSessionLimit().getLibreOfficeSessionLimit();
-        }
-        this.unoServerEndpoints = buildUnoServerEndpoints(processExecutor, libreOfficeLimit);
-        ProcessExecutor.setUnoServerPool(new UnoServerPool(this.unoServerEndpoints));
     }
 
     private String resolvePath(String defaultPath, String customPath) {
@@ -132,69 +114,4 @@ public class RuntimePathConfig {
     private boolean isRunningInDocker() {
         return Files.exists(Path.of("/.dockerenv"));
     }
-
-    private List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> buildUnoServerEndpoints(
-            ApplicationProperties.ProcessExecutor processExecutor, int sessionLimit) {
-        if (processExecutor == null) {
-            log.warn("ProcessExecutor config missing; defaulting to a single UNO endpoint.");
-            return Collections.singletonList(
-                    new ApplicationProperties.ProcessExecutor.UnoServerEndpoint());
-        }
-        if (!processExecutor.isAutoUnoServer()) {
-            List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> configured =
-                    sanitizeUnoServerEndpoints(processExecutor.getUnoServerEndpoints());
-            if (!configured.isEmpty()) {
-                // Warn if manual endpoint count doesn't match sessionLimit
-                if (configured.size() != sessionLimit) {
-                    log.warn(
-                            "Manual UNO endpoint count ({}) differs from libreOfficeSessionLimit ({}). "
-                                    + "Concurrency will be limited by endpoint count, not sessionLimit.",
-                            configured.size(),
-                            sessionLimit);
-                }
-                return configured;
-            }
-            log.warn(
-                    "autoUnoServer disabled but no unoServerEndpoints configured; defaulting to 127.0.0.1:2003.");
-            return Collections.singletonList(
-                    new ApplicationProperties.ProcessExecutor.UnoServerEndpoint());
-        }
-        int count = sessionLimit > 0 ? sessionLimit : 1;
-        return buildAutoUnoServerEndpoints(count);
-    }
-
-    private List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint>
-            buildAutoUnoServerEndpoints(int count) {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints = new ArrayList<>();
-        int basePort = 2003;
-        for (int i = 0; i < count; i++) {
-            ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint =
-                    new ApplicationProperties.ProcessExecutor.UnoServerEndpoint();
-            endpoint.setHost("127.0.0.1");
-            endpoint.setPort(basePort + (i * 2));
-            endpoints.add(endpoint);
-        }
-        return endpoints;
-    }
-
-    private List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint>
-            sanitizeUnoServerEndpoints(
-                    List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints) {
-        if (endpoints == null || endpoints.isEmpty()) {
-            return Collections.emptyList();
-        }
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> sanitized = new ArrayList<>();
-        for (ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint : endpoints) {
-            if (endpoint == null) {
-                continue;
-            }
-            String host = endpoint.getHost();
-            int port = endpoint.getPort();
-            if (host == null || host.isBlank() || port <= 0) {
-                continue;
-            }
-            sanitized.add(endpoint);
-        }
-        return sanitized;
-    }
 }

app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java

@@ -61,7 +61,6 @@ public class ApplicationProperties {
     private AutomaticallyGenerated automaticallyGenerated = new AutomaticallyGenerated();
 
     private Mail mail = new Mail();
-    private Telegram telegram = new Telegram();
 
     private Premium premium = new Premium();
 
@@ -164,7 +163,6 @@ public class ApplicationProperties {
         private String customGlobalAPIKey;
         private Jwt jwt = new Jwt();
         private Validation validation = new Validation();
-        private String xFrameOptions = "DENY";
 
         public Boolean isAltLogin() {
             return saml2.getEnabled() || oauth2.getEnabled();
@@ -420,15 +418,6 @@ public class ApplicationProperties {
 
         // 'https://app.example.com'). If not set, falls back to backendUrl.
         private boolean enableMobileScanner = false; // Enable mobile phone QR code upload feature
-        private MobileScannerSettings mobileScannerSettings = new MobileScannerSettings();
-
-        @Data
-        public static class MobileScannerSettings {
-            private boolean convertToPdf = true; // Whether to automatically convert images to PDF
-            private String imageResolution = "full"; // Options: "full", "reduced"
-            private String pageFormat = "A4"; // Options: "keep", "A4", "letter"
-            private boolean stretchToFit = false; // Whether to stretch image to fill page
-        }
 
         public boolean isAnalyticsEnabled() {
             return this.getEnableAnalytics() != null && this.getEnableAnalytics();
@@ -553,10 +542,10 @@ public class ApplicationProperties {
         @Override
         public String toString() {
             return """
-            Driver {
-              driverName='%s'
-            }
-            """
+      Driver {
+        driverName='%s'
+      }
+      """
                     .formatted(driverName);
         }
     }
@@ -609,7 +598,6 @@ public class ApplicationProperties {
         private boolean ssoAutoLogin;
         private CustomMetadata customMetadata = new CustomMetadata();
 
-        @Deprecated
         @Data
         public static class CustomMetadata {
             private boolean autoUpdateMetadata;
@@ -617,23 +605,16 @@ public class ApplicationProperties {
             private String creator;
             private String producer;
 
-            @Deprecated
             public String getCreator() {
                 return creator == null || creator.trim().isEmpty() ? "Stirling-PDF" : creator;
             }
 
-            @Deprecated
             public String getProducer() {
                 return producer == null || producer.trim().isEmpty() ? "Stirling-PDF" : producer;
             }
         }
     }
 
-    /**
-     * Mail server configuration properties.
-     *
-     * @since 0.46.1
-     */
     @Data
     public static class Mail {
         private boolean enabled;
@@ -656,102 +637,6 @@ public class ApplicationProperties {
         private Boolean sslCheckServerIdentity;
     }
 
-    /**
-     * Telegram bot configuration properties.
-     *
-     * @since 2.2.x
-     */
-    @Data
-    public static class Telegram {
-        private Boolean enabled = false;
-        @ToString.Exclude private String botToken;
-        private String botUsername;
-        private String pipelineInboxFolder = "telegram";
-        private Boolean customFolderSuffix = false;
-        private Boolean enableAllowUserIDs = false;
-        private List<Long> allowUserIDs = new ArrayList<>();
-        private Boolean enableAllowChannelIDs = false;
-        private List<Long> allowChannelIDs = new ArrayList<>();
-        private long processingTimeoutSeconds = 180;
-        private long pollingIntervalMillis = 2000;
-        private Feedback feedback = new Feedback();
-
-        /**
-         * Configuration for feedback messages sent by the Telegram bot.
-         *
-         * @since 2.2.x
-         */
-        @Data
-        public static class Feedback {
-            private Channel channel = new Channel();
-            private User user = new User();
-
-            /**
-             * Channel-specific feedback settings.
-             *
-             * @since 2.2.x
-             */
-            @Data
-            public static class Channel {
-                /**
-                 * Set to {@code false} to hide/suppress "no valid document" feedback messages to
-                 * the channel (to avoid spam).
-                 */
-                private Boolean noValidDocument = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress generic error feedback messages to the
-                 * channel (to avoid spam).
-                 */
-                private Boolean errorMessage = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress processing error feedback messages to the
-                 * channel (to avoid spam).
-                 */
-                private Boolean errorProcessing = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress "processing" feedback messages to the
-                 * channel (to avoid spam).
-                 */
-                private Boolean processing = true;
-            }
-
-            /**
-             * User-specific feedback settings.
-             *
-             * @since 2.2.x
-             */
-            @Data
-            public static class User {
-                /**
-                 * Set to {@code false} to hide/suppress "no valid document" feedback messages to
-                 * users (to avoid spam).
-                 */
-                private Boolean noValidDocument = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress generic error feedback messages to users
-                 * (to avoid spam).
-                 */
-                private Boolean errorMessage = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress processing error feedback messages to users
-                 * (to avoid spam).
-                 */
-                private Boolean errorProcessing = true;
-
-                /**
-                 * Set to {@code false} to hide/suppress "processing" feedback messages to users (to
-                 * avoid spam).
-                 */
-                private Boolean processing = true;
-            }
-        }
-    }
-
     @Data
     public static class Premium {
         private boolean enabled;
@@ -828,16 +713,6 @@ public class ApplicationProperties {
     public static class ProcessExecutor {
         private SessionLimit sessionLimit = new SessionLimit();
         private TimeoutMinutes timeoutMinutes = new TimeoutMinutes();
-        private boolean autoUnoServer = true;
-        private List<UnoServerEndpoint> unoServerEndpoints = new ArrayList<>();
-
-        @Data
-        public static class UnoServerEndpoint {
-            private String host = "127.0.0.1";
-            private int port = 2003;
-            private String hostLocation = "auto"; // auto|local|remote
-            private String protocol = "http"; // http|https
-        }
 
         @Data
         public static class SessionLimit {

app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java

@@ -0,0 +1,40 @@
+package stirling.software.common.model;
+
+/* Commented out entire InputStreamTemplateResource class - Thymeleaf dependency removed
+ * This class will be removed when frontend migration to React is complete
+
+
+
+@RequiredArgsConstructor
+@Getter
+public class InputStreamTemplateResource implements ITemplateResource {
+    private final InputStream inputStream;
+    private final String characterEncoding;
+
+    @Override
+    public Reader reader() throws IOException {
+        return new InputStreamReader(inputStream, characterEncoding);
+    }
+
+    @Override
+    public ITemplateResource relative(String relativeLocation) {
+        // Implement logic for relative resources, if needed
+        throw new UnsupportedOperationException("Relative resources not supported");
+    }
+
+    @Override
+    public String getDescription() {
+        return "InputStream resource [Stream]";
+    }
+
+    @Override
+    public String getBaseName() {
+        return "streamResource";
+    }
+
+    @Override
+    public boolean exists() {
+        return inputStream != null;
+    }
+}
+*/

app/common/src/main/java/stirling/software/common/util/EmlParser.java

@@ -1,417 +1,651 @@
 package stirling.software.common.util;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.ZoneOffset;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.Properties;
+import java.util.regex.Pattern;
 
-import org.simplejavamail.api.email.AttachmentResource;
-import org.simplejavamail.api.email.Email;
-import org.simplejavamail.api.email.Recipient;
-import org.simplejavamail.converter.EmailConverter;
-
-import jakarta.activation.DataSource;
-import jakarta.mail.Message.RecipientType;
+import org.springframework.http.MediaType;
 
 import lombok.Data;
 import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 
-@Slf4j
 @UtilityClass
 public class EmlParser {
 
-    // Configuration constants
-    private final int DEFAULT_MAX_ATTACHMENT_MB = 10;
-    private final long MAX_SIZE_ESTIMATION_BYTES = 500L * 1024 * 1024; // 500MB
+    private static volatile Boolean jakartaMailAvailable = null;
+    private static volatile Method mimeUtilityDecodeTextMethod = null;
+    private static volatile boolean mimeUtilityChecked = false;
 
-    // Message constants
-    private final String NO_CONTENT_MESSAGE = "Email content could not be parsed";
-    private final String ATTACHMENT_PREFIX = "attachment-";
+    private static final Pattern MIME_ENCODED_PATTERN =
+            RegexPatternUtils.getInstance().getMimeEncodedWordPattern();
 
-    public EmailContent extractEmailContent(
+    private static final String DISPOSITION_ATTACHMENT = "attachment";
+    private static final String TEXT_PLAIN = MediaType.TEXT_PLAIN_VALUE;
+    private static final String TEXT_HTML = MediaType.TEXT_HTML_VALUE;
+    private static final String MULTIPART_PREFIX = "multipart/";
+
+    private static final String HEADER_CONTENT_TYPE = "content-type:";
+    private static final String HEADER_CONTENT_DISPOSITION = "content-disposition:";
+    private static final String HEADER_CONTENT_TRANSFER_ENCODING = "content-transfer-encoding:";
+    private static final String HEADER_CONTENT_ID = "Content-ID";
+    private static final String HEADER_SUBJECT = "Subject:";
+    private static final String HEADER_FROM = "From:";
+    private static final String HEADER_TO = "To:";
+    private static final String HEADER_CC = "Cc:";
+    private static final String HEADER_BCC = "Bcc:";
+    private static final String HEADER_DATE = "Date:";
+
+    private static synchronized boolean isJakartaMailAvailable() {
+        if (jakartaMailAvailable == null) {
+            try {
+                Class.forName("jakarta.mail.internet.MimeMessage");
+                Class.forName("jakarta.mail.Session");
+                Class.forName("jakarta.mail.internet.MimeUtility");
+                Class.forName("jakarta.mail.internet.MimePart");
+                Class.forName("jakarta.mail.internet.MimeMultipart");
+                Class.forName("jakarta.mail.Multipart");
+                Class.forName("jakarta.mail.Part");
+                jakartaMailAvailable = true;
+            } catch (ClassNotFoundException e) {
+                jakartaMailAvailable = false;
+            }
+        }
+        return jakartaMailAvailable;
+    }
+
+    public static EmailContent extractEmailContent(
             byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer)
             throws IOException {
-
         EmlProcessingUtils.validateEmlInput(emlBytes);
 
-        Email email = parseEmail(emlBytes);
-        return buildEmailContent(email, request, customHtmlSanitizer);
-    }
-
-    private Email parseEmail(byte[] emlBytes) throws IOException {
-        boolean isMsgFile = EmlProcessingUtils.isMsgFile(emlBytes);
-        try (ByteArrayInputStream input = new ByteArrayInputStream(emlBytes)) {
-            Email email;
-            if (isMsgFile) {
-                try {
-                    email = EmailConverter.outlookMsgToEmail(input);
-                } catch (Exception e) {
-                    // OLE2 magic bytes match but parsing failed - might be DOC/XLS/other OLE2 file
-                    throw new IOException(
-                            "The file appears to be an OLE2 file (MSG/DOC/XLS) but could not be "
-                                    + "parsed as an Outlook email. Ensure it is a valid .msg file: "
-                                    + e.getMessage(),
-                            e);
-                }
-            } else {
-                email = EmailConverter.emlToEmail(input);
-            }
-
-            return email;
-        } catch (IOException e) {
-            throw e; // Re-throw IOException as-is
-        } catch (Exception e) {
-            throw new IOException(
-                    String.format(
-                            "Failed to parse EML file with Simple Java Mail: %s", e.getMessage()),
-                    e);
+        if (isJakartaMailAvailable()) {
+            return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
+        } else {
+            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
         }
     }
 
-    private EmailContent buildEmailContent(
-            Email email, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer)
-            throws IOException {
-
+    private static EmailContent extractEmailContentBasic(
+            byte[] emlBytes, CustomHtmlSanitizer customHtmlSanitizer) {
+        String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
         EmailContent content = new EmailContent();
-        content.setSubject(defaultString(email.getSubject()));
-        content.setFrom(formatRecipient(email.getFromRecipient()));
-        content.setTo(formatRecipients(email.getRecipients(), RecipientType.TO));
-        content.setCc(formatRecipients(email.getRecipients(), RecipientType.CC));
-        content.setBcc(formatRecipients(email.getRecipients(), RecipientType.BCC));
 
-        Date sentDate = email.getSentDate();
-        if (sentDate != null) {
-            // Use UTC for consistent timezone handling across deployments
-            content.setDate(ZonedDateTime.ofInstant(sentDate.toInstant(), ZoneOffset.UTC));
+        content.setSubject(extractBasicHeader(emlContent, HEADER_SUBJECT));
+        content.setFrom(extractBasicHeader(emlContent, HEADER_FROM));
+        content.setTo(extractBasicHeader(emlContent, HEADER_TO));
+        content.setCc(extractBasicHeader(emlContent, HEADER_CC));
+        content.setBcc(extractBasicHeader(emlContent, HEADER_BCC));
+
+        String dateStr = extractBasicHeader(emlContent, HEADER_DATE);
+        if (!dateStr.isEmpty()) {
+            content.setDateString(dateStr);
         }
 
-        String htmlBody = email.getHTMLText();
-        if (customHtmlSanitizer != null && htmlBody != null) {
-            htmlBody = customHtmlSanitizer.sanitize(htmlBody);
-        }
-        content.setHtmlBody(htmlBody);
-
-        String textBody = email.getPlainText();
-        if (customHtmlSanitizer != null && textBody != null) {
-            textBody = customHtmlSanitizer.sanitize(textBody);
-        }
-        content.setTextBody(textBody);
-
-        if (isBlank(content.getHtmlBody()) && isBlank(content.getTextBody())) {
-            content.setTextBody(NO_CONTENT_MESSAGE);
+        String htmlBody = extractHtmlBody(emlContent);
+        if (htmlBody != null) {
+            content.setHtmlBody(htmlBody);
+        } else {
+            String textBody = extractTextBody(emlContent);
+            content.setTextBody(textBody != null ? textBody : "Email content could not be parsed");
         }
 
-        List<EmailAttachment> attachments = new ArrayList<>();
-        attachments.addAll(mapResources(email.getEmbeddedImages(), request, true));
-        attachments.addAll(mapResources(email.getAttachments(), request, false));
-        content.setAttachments(attachments);
-        content.setAttachmentCount(attachments.size());
+        content.getAttachments().addAll(extractAttachmentsBasic(emlContent));
 
         return content;
     }
 
-    private List<EmailAttachment> mapResources(
-            List<AttachmentResource> resources, EmlToPdfRequest request, boolean embedded)
-            throws IOException {
+    private static EmailContent extractEmailContentAdvanced(
+            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
+        try {
+            Class<?> sessionClass = Class.forName("jakarta.mail.Session");
+            Class<?> mimeMessageClass = Class.forName("jakarta.mail.internet.MimeMessage");
 
-        if (resources == null || resources.isEmpty()) {
-            return List.of();
+            Method getDefaultInstance =
+                    sessionClass.getMethod("getDefaultInstance", Properties.class);
+            Object session = getDefaultInstance.invoke(null, new Properties());
+
+            Class<?>[] constructorArgs = new Class<?>[] {sessionClass, InputStream.class};
+            Constructor<?> mimeMessageConstructor =
+                    mimeMessageClass.getConstructor(constructorArgs);
+            Object message =
+                    mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
+
+            return extractFromMimeMessage(message, request, customHtmlSanitizer);
+
+        } catch (ReflectiveOperationException e) {
+            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
         }
-
-        List<EmailAttachment> mapped = new ArrayList<>(resources.size());
-        int unnamedCounter = 0; // Start at 0, increment before use
-
-        for (AttachmentResource resource : resources) {
-            if (resource == null) {
-                continue; // Skip null resources early
-            }
-
-            // Pre-determine if this resource needs a generated filename
-            boolean needsGeneratedName = !embedded && needsGeneratedFilename(resource);
-
-            if (needsGeneratedName) {
-                unnamedCounter++;
-            }
-
-            EmailAttachment attachment =
-                    toEmailAttachment(resource, request, embedded, unnamedCounter);
-            if (attachment != null) {
-                mapped.add(attachment);
-            }
-        }
-        return mapped;
     }
 
-    /** Checks if a resource needs a generated filename (has no usable name). */
-    private boolean needsGeneratedFilename(AttachmentResource resource) {
-        if (resource == null) {
-            return false;
+    private static EmailContent extractFromMimeMessage(
+            Object message, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
+        EmailContent content = new EmailContent();
+
+        try {
+            Class<?> messageClass = message.getClass();
+
+            Method getSubject = messageClass.getMethod("getSubject");
+            String subject = (String) getSubject.invoke(message);
+            content.setSubject(subject != null ? safeMimeDecode(subject) : "No Subject");
+
+            Method getFrom = messageClass.getMethod("getFrom");
+            Object[] fromAddresses = (Object[]) getFrom.invoke(message);
+            content.setFrom(buildAddressString(fromAddresses));
+
+            extractRecipients(message, messageClass, content);
+
+            Method getSentDate = messageClass.getMethod("getSentDate");
+            Date legacyDate = (Date) getSentDate.invoke(message);
+            if (legacyDate != null) {
+                content.setDate(
+                        ZonedDateTime.ofInstant(legacyDate.toInstant(), ZoneId.systemDefault()));
+            }
+
+            Method getContent = messageClass.getMethod("getContent");
+            Object messageContent = getContent.invoke(message);
+
+            processMessageContent(message, messageContent, content, request, customHtmlSanitizer);
+
+        } catch (ReflectiveOperationException | RuntimeException e) {
+            content.setSubject("Email Conversion");
+            content.setFrom("Unknown");
+            content.setTo("Unknown");
+            content.setCc("");
+            content.setBcc("");
+            content.setTextBody("Email content could not be parsed with advanced processing");
         }
-        String resourceName = resource.getName();
-        if (!isBlank(resourceName)) {
-            return false;
-        }
-        DataSource dataSource = resource.getDataSource();
-        return isBlank(dataSource.getName());
+
+        return content;
     }
 
-    private EmailAttachment toEmailAttachment(
-            AttachmentResource resource, EmlToPdfRequest request, boolean embedded, int counter)
-            throws IOException {
+    private static void extractRecipients(
+            Object message, Class<?> messageClass, EmailContent content) {
+        try {
+            Method getRecipients =
+                    messageClass.getMethod(
+                            "getRecipients", Class.forName("jakarta.mail.Message$RecipientType"));
+            Class<?> recipientTypeClass = Class.forName("jakarta.mail.Message$RecipientType");
 
-        if (resource == null) {
-            return null;
-        }
+            Object toType = recipientTypeClass.getField("TO").get(null);
+            Object[] toRecipients = (Object[]) getRecipients.invoke(message, toType);
+            content.setTo(buildAddressString(toRecipients));
 
-        EmailAttachment attachment = new EmailAttachment();
-        attachment.setEmbedded(embedded);
+            Object ccType = recipientTypeClass.getField("CC").get(null);
+            Object[] ccRecipients = (Object[]) getRecipients.invoke(message, ccType);
+            content.setCc(buildAddressString(ccRecipients));
 
-        String resourceName = defaultString(resource.getName());
-        String filename = resourceName;
-        DataSource dataSource = resource.getDataSource();
-        String contentType = dataSource.getContentType();
+            Object bccType = recipientTypeClass.getField("BCC").get(null);
+            Object[] bccRecipients = (Object[]) getRecipients.invoke(message, bccType);
+            content.setBcc(buildAddressString(bccRecipients));
 
-        if (!isBlank(dataSource.getName())) {
-            filename = dataSource.getName();
-        }
-        filename = safeMimeDecode(filename);
-
-        // Generate unique filename for unnamed attachments
-        if (isBlank(filename)) {
-            String extension = detectExtensionFromMimeType(contentType);
-            filename = embedded ? resourceName : (ATTACHMENT_PREFIX + counter + extension);
-        }
-        attachment.setFilename(filename);
-
-        String contentId = embedded ? stripCid(resourceName) : null;
-        attachment.setContentId(contentId);
-
-        String detectedContentType = EmlProcessingUtils.detectMimeType(filename, contentType);
-        attachment.setContentType(detectedContentType);
-
-        // Read data with size limit to prevent OOM
-        ReadResult readResult = readData(dataSource, embedded, request);
-        if (readResult != null) {
-            attachment.setSizeBytes(readResult.totalSize);
-            if (shouldIncludeAttachmentData(embedded, request, readResult)) {
-                attachment.setData(readResult.data);
+        } catch (ReflectiveOperationException e) {
+            try {
+                Method getAllRecipients = messageClass.getMethod("getAllRecipients");
+                Object[] recipients = (Object[]) getAllRecipients.invoke(message);
+                content.setTo(buildAddressString(recipients));
+                content.setCc("");
+                content.setBcc("");
+            } catch (ReflectiveOperationException ex) {
+                content.setTo("");
+                content.setCc("");
+                content.setBcc("");
             }
         }
-
-        return attachment;
     }
 
-    private boolean shouldIncludeAttachmentData(
-            boolean embedded, EmlToPdfRequest request, ReadResult readResult) {
-        // Always include embedded images for proper rendering
-        if (embedded) {
-            return readResult != null && readResult.data() != null;
-        }
-        // Check if attachments are requested and data is available within size limit
-        if (request == null || !request.isIncludeAttachments()) {
-            return false;
-        }
-        if (readResult == null || readResult.data() == null) {
-            return false;
-        }
-        return readResult.data().length <= getMaxAttachmentSizeBytes(request);
-    }
-
-    private String detectExtensionFromMimeType(String mimeType) {
-        if (mimeType == null) {
+    private static String buildAddressString(Object[] addresses) {
+        if (addresses == null || addresses.length == 0) {
             return "";
         }
 
-        String lower = mimeType.toLowerCase(Locale.ROOT);
-
-        // Remove any parameters (e.g., "text/plain; charset=utf-8" -> "text/plain")
-        int semicolon = lower.indexOf(';');
-        if (semicolon > 0) {
-            lower = lower.substring(0, semicolon).trim();
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < addresses.length; i++) {
+            if (i > 0) builder.append(", ");
+            builder.append(safeMimeDecode(addresses[i].toString()));
         }
-
-        // Match exact MIME types first, then fall back to contains() for variants
-        return switch (lower) {
-            case "application/pdf" -> ".pdf";
-            case "image/png" -> ".png";
-            case "image/jpeg", "image/jpg" -> ".jpg";
-            case "image/gif" -> ".gif";
-            case "image/webp" -> ".webp";
-            case "image/bmp" -> ".bmp";
-            case "text/plain" -> ".txt";
-            case "text/html" -> ".html";
-            case "text/xml", "application/xml" -> ".xml";
-            case "application/json" -> ".json";
-            case "application/zip" -> ".zip";
-            case "application/octet-stream" -> ".bin";
-            default -> {
-                if (lower.contains("wordprocessingml") || lower.contains("msword")) yield ".docx";
-                if (lower.contains("spreadsheetml") || lower.contains("excel")) yield ".xlsx";
-                if (lower.contains("presentationml") || lower.contains("powerpoint")) yield ".pptx";
-                if (lower.contains("opendocument.text")) yield ".odt";
-                if (lower.contains("opendocument.spreadsheet")) yield ".ods";
-                yield "";
-            }
-        };
+        return builder.toString();
     }
 
-    private ReadResult readData(DataSource dataSource, boolean embedded, EmlToPdfRequest request)
-            throws IOException {
-        if (dataSource == null) {
-            return null;
-        }
+    private static void processMessageContent(
+            Object message,
+            Object messageContent,
+            EmailContent content,
+            EmlToPdfRequest request,
+            CustomHtmlSanitizer customHtmlSanitizer) {
+        try {
+            if (messageContent instanceof String stringContent) {
+                Method getContentType = message.getClass().getMethod("getContentType");
+                String contentType = (String) getContentType.invoke(message);
 
-        long maxBytes = getMaxAttachmentSizeBytes(request);
-
-        try (InputStream input = dataSource.getInputStream()) {
-            // Embedded images are usually needed for display regardless of size,
-            // but regular attachments should be guarded against OOM
-            if (!embedded && request != null) {
-                byte[] buffer = new byte[8192];
-                ByteArrayOutputStream output = new ByteArrayOutputStream();
-                int bytesRead;
-                long totalBytes = 0;
-                while ((bytesRead = input.read(buffer)) != -1) {
-                    totalBytes += bytesRead;
-                    if (totalBytes > maxBytes) {
-                        // Attachment too large - skip remaining data but estimate total size
-                        long remainingBytes = countRemainingBytes(input, totalBytes);
-                        log.debug(
-                                "Attachment exceeds size limit: {} bytes (max: {} bytes), skipping",
-                                remainingBytes,
-                                maxBytes);
-                        return new ReadResult(null, remainingBytes);
-                    }
-                    output.write(buffer, 0, bytesRead);
+                if (contentType != null
+                        && contentType.toLowerCase(Locale.ROOT).contains(TEXT_HTML)) {
+                    content.setHtmlBody(stringContent);
+                } else {
+                    content.setTextBody(stringContent);
                 }
-                byte[] data = output.toByteArray();
-                return new ReadResult(data, data.length);
             } else {
-                byte[] data = input.readAllBytes();
-                return new ReadResult(data, data.length);
+                Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
+                if (multipartClass.isInstance(messageContent)) {
+                    processMultipart(messageContent, content, request, customHtmlSanitizer, 0);
+                }
             }
-        } catch (IOException e) {
-            if (embedded) {
-                log.debug(
-                        "Failed to read embedded image, using empty placeholder: {}",
-                        e.getMessage());
-                return new ReadResult(new byte[0], 0);
-            }
-            throw e;
+        } catch (ReflectiveOperationException | ClassCastException e) {
+            content.setTextBody("Email content could not be parsed with advanced processing");
         }
     }
 
-    private long countRemainingBytes(InputStream input, long alreadyRead) throws IOException {
-        long count = alreadyRead;
+    private static void processMultipart(
+            Object multipart,
+            EmailContent content,
+            EmlToPdfRequest request,
+            CustomHtmlSanitizer customHtmlSanitizer,
+            int depth) {
 
-        long skipped;
-        while (count < MAX_SIZE_ESTIMATION_BYTES
-                && (skipped = input.skip(MAX_SIZE_ESTIMATION_BYTES - count)) > 0) {
-            count += skipped;
+        final int MAX_MULTIPART_DEPTH = 10;
+        if (depth > MAX_MULTIPART_DEPTH) {
+            content.setHtmlBody("<div class=\"error\">Maximum multipart depth exceeded</div>");
+            return;
         }
 
-        if (count < MAX_SIZE_ESTIMATION_BYTES && input.available() > 0) {
-            byte[] buffer = new byte[8192];
-            int read;
-            while ((read = input.read(buffer)) != -1 && count < MAX_SIZE_ESTIMATION_BYTES) {
-                count += read;
+        try {
+            Class<?> multipartClass = multipart.getClass();
+            Method getCount = multipartClass.getMethod("getCount");
+            int count = (Integer) getCount.invoke(multipart);
+
+            Method getBodyPart = multipartClass.getMethod("getBodyPart", int.class);
+
+            for (int i = 0; i < count; i++) {
+                Object part = getBodyPart.invoke(multipart, i);
+                processPart(part, content, request, customHtmlSanitizer, depth + 1);
             }
-        }
 
-        return count;
+        } catch (ReflectiveOperationException | ClassCastException e) {
+            content.setHtmlBody("<div class=\"error\">Error processing multipart content</div>");
+        }
     }
 
-    private String formatRecipients(List<Recipient> recipients, RecipientType type) {
-        if (recipients == null || type == null) {
+    private static void processPart(
+            Object part,
+            EmailContent content,
+            EmlToPdfRequest request,
+            CustomHtmlSanitizer customHtmlSanitizer,
+            int depth) {
+        try {
+            Class<?> partClass = part.getClass();
+
+            Method isMimeType = partClass.getMethod("isMimeType", String.class);
+            Method getContent = partClass.getMethod("getContent");
+            Method getDisposition = partClass.getMethod("getDisposition");
+            Method getFileName = partClass.getMethod("getFileName");
+            Method getContentType = partClass.getMethod("getContentType");
+            Method getHeader = partClass.getMethod("getHeader", String.class);
+
+            Object disposition = getDisposition.invoke(part);
+            String filename = (String) getFileName.invoke(part);
+            String contentType = (String) getContentType.invoke(part);
+
+            String normalizedDisposition =
+                    disposition != null ? ((String) disposition).toLowerCase(Locale.ROOT) : null;
+
+            if ((Boolean) isMimeType.invoke(part, TEXT_PLAIN) && normalizedDisposition == null) {
+                Object partContent = getContent.invoke(part);
+                if (partContent instanceof String stringContent) {
+                    content.setTextBody(stringContent);
+                }
+            } else if ((Boolean) isMimeType.invoke(part, TEXT_HTML)
+                    && normalizedDisposition == null) {
+                Object partContent = getContent.invoke(part);
+                if (partContent instanceof String stringContent) {
+                    String htmlBody =
+                            customHtmlSanitizer != null
+                                    ? customHtmlSanitizer.sanitize(stringContent)
+                                    : stringContent;
+                    content.setHtmlBody(htmlBody);
+                }
+            } else if ((normalizedDisposition != null
+                            && normalizedDisposition.contains(DISPOSITION_ATTACHMENT))
+                    || (filename != null && !filename.trim().isEmpty())) {
+
+                processAttachment(
+                        part, content, request, getHeader, getContent, filename, contentType);
+            } else if ((Boolean) isMimeType.invoke(part, "multipart/*")) {
+                Object multipartContent = getContent.invoke(part);
+                if (multipartContent != null) {
+                    Class<?> multipartClass = Class.forName("jakarta.mail.Multipart");
+                    if (multipartClass.isInstance(multipartContent)) {
+                        processMultipart(
+                                multipartContent, content, request, customHtmlSanitizer, depth + 1);
+                    }
+                }
+            }
+
+        } catch (ReflectiveOperationException | RuntimeException e) {
+            // Continue processing other parts if one fails
+        }
+    }
+
+    private static void processAttachment(
+            Object part,
+            EmailContent content,
+            EmlToPdfRequest request,
+            Method getHeader,
+            Method getContent,
+            String filename,
+            String contentType) {
+
+        content.setAttachmentCount(content.getAttachmentCount() + 1);
+
+        if (filename != null && !filename.trim().isEmpty()) {
+            EmailAttachment attachment = new EmailAttachment();
+            attachment.setFilename(safeMimeDecode(filename));
+            attachment.setContentType(contentType);
+
+            try {
+                String[] contentIdHeaders = (String[]) getHeader.invoke(part, HEADER_CONTENT_ID);
+                if (contentIdHeaders != null) {
+                    for (String contentIdHeader : contentIdHeaders) {
+                        if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
+                            attachment.setEmbedded(true);
+                            String contentId =
+                                    RegexPatternUtils.getInstance()
+                                            .getAngleBracketsPattern()
+                                            .matcher(contentIdHeader.trim())
+                                            .replaceAll("");
+                            attachment.setContentId(contentId);
+                            break;
+                        }
+                    }
+                }
+            } catch (ReflectiveOperationException e) {
+            }
+
+            if ((request != null && request.isIncludeAttachments()) || attachment.isEmbedded()) {
+                extractAttachmentData(part, attachment, getContent, request);
+            }
+
+            content.getAttachments().add(attachment);
+        }
+    }
+
+    private static void extractAttachmentData(
+            Object part, EmailAttachment attachment, Method getContent, EmlToPdfRequest request) {
+        try {
+            Object attachmentContent = getContent.invoke(part);
+            byte[] attachmentData = null;
+
+            if (attachmentContent instanceof InputStream inputStream) {
+                try (InputStream stream = inputStream) {
+                    attachmentData = stream.readAllBytes();
+                } catch (IOException e) {
+                    if (attachment.isEmbedded()) {
+                        attachmentData = new byte[0];
+                    } else {
+                        throw new RuntimeException(e);
+                    }
+                }
+            } else if (attachmentContent instanceof byte[] byteArray) {
+                attachmentData = byteArray;
+            } else if (attachmentContent instanceof String stringContent) {
+                attachmentData = stringContent.getBytes(StandardCharsets.UTF_8);
+            }
+
+            if (attachmentData != null) {
+                long maxSizeMB = request != null ? request.getMaxAttachmentSizeMB() : 10L;
+                long maxSizeBytes = maxSizeMB * 1024 * 1024;
+
+                if (attachmentData.length <= maxSizeBytes || attachment.isEmbedded()) {
+                    attachment.setData(attachmentData);
+                    attachment.setSizeBytes(attachmentData.length);
+                } else {
+                    attachment.setSizeBytes(attachmentData.length);
+                }
+            }
+        } catch (ReflectiveOperationException | RuntimeException e) {
+            // Continue without attachment data
+        }
+    }
+
+    private static String extractBasicHeader(String emlContent, String headerName) {
+        try {
+            String[] lines =
+                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
+            for (int i = 0; i < lines.length; i++) {
+                String line = lines[i];
+                if (line.toLowerCase(Locale.ROOT).startsWith(headerName.toLowerCase(Locale.ROOT))) {
+                    StringBuilder value =
+                            new StringBuilder(line.substring(headerName.length()).trim());
+                    for (int j = i + 1; j < lines.length; j++) {
+                        if (lines[j].startsWith(" ") || lines[j].startsWith("\t")) {
+                            value.append(" ").append(lines[j].trim());
+                        } else {
+                            break;
+                        }
+                    }
+                    return safeMimeDecode(value.toString());
+                }
+                if (line.trim().isEmpty()) break;
+            }
+        } catch (RuntimeException e) {
+            // Ignore errors in header extraction
+        }
+        return "";
+    }
+
+    private static String extractHtmlBody(String emlContent) {
+        try {
+            String lowerContent = emlContent.toLowerCase(Locale.ROOT);
+            int htmlStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_HTML);
+            if (htmlStart == -1) return null;
+
+            int bodyStart = emlContent.indexOf("\r\n\r\n", htmlStart);
+            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", htmlStart);
+            if (bodyStart == -1) return null;
+
+            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
+            int bodyEnd = findPartEnd(emlContent, bodyStart);
+
+            return emlContent.substring(bodyStart, bodyEnd).trim();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static String extractTextBody(String emlContent) {
+        try {
+            String lowerContent = emlContent.toLowerCase(Locale.ROOT);
+            int textStart = lowerContent.indexOf(HEADER_CONTENT_TYPE + " " + TEXT_PLAIN);
+            if (textStart == -1) {
+                int bodyStart = emlContent.indexOf("\r\n\r\n");
+                if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n");
+                if (bodyStart != -1) {
+                    bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
+                    int bodyEnd = findPartEnd(emlContent, bodyStart);
+                    return emlContent.substring(bodyStart, bodyEnd).trim();
+                }
+                return null;
+            }
+
+            int bodyStart = emlContent.indexOf("\r\n\r\n", textStart);
+            if (bodyStart == -1) bodyStart = emlContent.indexOf("\n\n", textStart);
+            if (bodyStart == -1) return null;
+
+            bodyStart += (emlContent.charAt(bodyStart + 1) == '\r') ? 4 : 2;
+            int bodyEnd = findPartEnd(emlContent, bodyStart);
+
+            return emlContent.substring(bodyStart, bodyEnd).trim();
+        } catch (RuntimeException e) {
+            return null;
+        }
+    }
+
+    private static int findPartEnd(String content, int start) {
+        String[] lines =
+                RegexPatternUtils.getInstance()
+                        .getNewlineSplitPattern()
+                        .split(content.substring(start));
+        StringBuilder result = new StringBuilder();
+
+        for (String line : lines) {
+            if (line.startsWith("--") && line.length() > 10) break;
+            result.append(line).append("\n");
+        }
+
+        return start + result.length();
+    }
+
+    private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
+        List<EmailAttachment> attachments = new ArrayList<>();
+        try {
+            String[] lines =
+                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
+            boolean inHeaders = true;
+            String currentContentType = "";
+            String currentDisposition = "";
+            String currentFilename = "";
+            String currentEncoding = "";
+
+            for (String line : lines) {
+                String lowerLine = line.toLowerCase(Locale.ROOT).trim();
+
+                if (line.trim().isEmpty()) {
+                    inHeaders = false;
+                    if (isAttachment(currentDisposition, currentFilename, currentContentType)) {
+                        EmailAttachment attachment = new EmailAttachment();
+                        attachment.setFilename(currentFilename);
+                        attachment.setContentType(currentContentType);
+                        attachment.setTransferEncoding(currentEncoding);
+                        attachments.add(attachment);
+                    }
+                    currentContentType = "";
+                    currentDisposition = "";
+                    currentFilename = "";
+                    currentEncoding = "";
+                    inHeaders = true;
+                    continue;
+                }
+
+                if (!inHeaders) continue;
+
+                if (lowerLine.startsWith(HEADER_CONTENT_TYPE)) {
+                    currentContentType = line.substring(HEADER_CONTENT_TYPE.length()).trim();
+                } else if (lowerLine.startsWith(HEADER_CONTENT_DISPOSITION)) {
+                    currentDisposition = line.substring(HEADER_CONTENT_DISPOSITION.length()).trim();
+                    currentFilename = extractFilenameFromDisposition(currentDisposition);
+                } else if (lowerLine.startsWith(HEADER_CONTENT_TRANSFER_ENCODING)) {
+                    currentEncoding =
+                            line.substring(HEADER_CONTENT_TRANSFER_ENCODING.length()).trim();
+                }
+            }
+        } catch (RuntimeException e) {
+            // Continue with empty list
+        }
+        return attachments;
+    }
+
+    private static boolean isAttachment(String disposition, String filename, String contentType) {
+        return (disposition.toLowerCase(Locale.ROOT).contains(DISPOSITION_ATTACHMENT)
+                        && !filename.isEmpty())
+                || (!filename.isEmpty()
+                        && !contentType.toLowerCase(Locale.ROOT).startsWith("text/"))
+                || (contentType.toLowerCase(Locale.ROOT).contains("application/")
+                        && !filename.isEmpty());
+    }
+
+    private static String extractFilenameFromDisposition(String disposition) {
+        if (disposition == null || !disposition.contains("filename=")) {
             return "";
         }
 
-        return recipients.stream()
-                .filter(Objects::nonNull)
-                // Use type.equals() for null-safe comparison (recipient.getType() may be null)
-                .filter(recipient -> type.equals(recipient.getType()))
-                .map(EmlParser::formatRecipient)
-                .filter(string -> !isBlank(string))
-                .collect(Collectors.joining(", "));
+        // Handle filename*= (RFC 2231 encoded filename)
+        if (disposition.toLowerCase(Locale.ROOT).contains("filename*=")) {
+            int filenameStarStart = disposition.toLowerCase(Locale.ROOT).indexOf("filename*=") + 10;
+            int filenameStarEnd = disposition.indexOf(";", filenameStarStart);
+            if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
+            String extendedFilename =
+                    disposition.substring(filenameStarStart, filenameStarEnd).trim();
+            extendedFilename =
+                    RegexPatternUtils.getInstance()
+                            .getQuotesRemovalPattern()
+                            .matcher(extendedFilename)
+                            .replaceAll("");
+
+            if (extendedFilename.contains("'")) {
+                String[] parts = extendedFilename.split("'", 3);
+                if (parts.length == 3) {
+                    return EmlProcessingUtils.decodeUrlEncoded(parts[2]);
+                }
+            }
+        }
+
+        // Handle regular filename=
+        int filenameStart = disposition.toLowerCase(Locale.ROOT).indexOf("filename=") + 9;
+        int filenameEnd = disposition.indexOf(";", filenameStart);
+        if (filenameEnd == -1) filenameEnd = disposition.length();
+        String filename = disposition.substring(filenameStart, filenameEnd).trim();
+        filename =
+                RegexPatternUtils.getInstance()
+                        .getQuotesRemovalPattern()
+                        .matcher(filename)
+                        .replaceAll("");
+        return safeMimeDecode(filename);
     }
 
-    private String formatRecipient(Recipient recipient) {
-        if (recipient == null) {
+    public static String safeMimeDecode(String headerValue) {
+        if (headerValue == null || headerValue.trim().isEmpty()) {
             return "";
         }
 
-        String name = safeMimeDecode(recipient.getName());
-        String address = safeMimeDecode(recipient.getAddress());
-
-        if (!isBlank(name) && !isBlank(address)) {
-            return name + " <" + address + ">";
+        if (!mimeUtilityChecked) {
+            synchronized (EmlParser.class) {
+                if (!mimeUtilityChecked) {
+                    initializeMimeUtilityDecoding();
+                }
+            }
         }
-        return !isBlank(name) ? name : address;
-    }
 
-    public String safeMimeDecode(String headerValue) {
-        if (isBlank(headerValue)) {
-            return "";
+        if (mimeUtilityDecodeTextMethod != null) {
+            try {
+                return (String) mimeUtilityDecodeTextMethod.invoke(null, headerValue.trim());
+            } catch (ReflectiveOperationException | RuntimeException e) {
+                // Fall through to custom implementation
+            }
         }
+
         return EmlProcessingUtils.decodeMimeHeader(headerValue.trim());
     }
 
-    private String stripCid(String contentId) {
-        if (contentId == null) {
-            return null;
-        }
-        return RegexPatternUtils.getInstance()
-                .getAngleBracketsPattern()
-                .matcher(contentId)
-                .replaceAll("")
-                .trim();
-    }
-
-    private long getMaxAttachmentSizeBytes(EmlToPdfRequest request) {
-        long maxMb = request != null ? request.getMaxAttachmentSizeMB() : DEFAULT_MAX_ATTACHMENT_MB;
-        return maxMb * 1024L * 1024L;
-    }
-
-    private boolean isBlank(String value) {
-        return value == null || value.trim().isEmpty();
-    }
-
-    private String defaultString(String value) {
-        return value != null ? value : "";
-    }
-
-    private record ReadResult(byte[] data, long totalSize) {
-        public ReadResult {
-            if (totalSize < 0) {
-                throw new IllegalArgumentException("Size cannot be negative: " + totalSize);
-            }
-            if (data != null && data.length > totalSize) {
-                throw new IllegalArgumentException(
-                        "Data length (" + data.length + ") exceeds total size (" + totalSize + ")");
-            }
+    private static void initializeMimeUtilityDecoding() {
+        try {
+            Class<?> mimeUtilityClass = Class.forName("jakarta.mail.internet.MimeUtility");
+            mimeUtilityDecodeTextMethod = mimeUtilityClass.getMethod("decodeText", String.class);
+        } catch (ClassNotFoundException | NoSuchMethodException e) {
+            mimeUtilityDecodeTextMethod = null;
         }
+        mimeUtilityChecked = true;
     }
 
     @Data
-    public class EmailContent {
+    public static class EmailContent {
         private String subject;
         private String from;
         private String to;
         private String cc;
         private String bcc;
         private ZonedDateTime date;
-        private String dateString; // Maintained for compatibility
+        private String dateString; // For basic parsing fallback
         private String htmlBody;
         private String textBody;
         private int attachmentCount;
@@ -439,7 +673,7 @@ public class EmlParser {
     }
 
     @Data
-    public class EmailAttachment {
+    public static class EmailAttachment {
         private String filename;
         private String contentType;
         private byte[] data;

app/common/src/main/java/stirling/software/common/util/EmlProcessingUtils.java

@@ -1,7 +1,5 @@
 package stirling.software.common.util;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -10,41 +8,32 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.MediaType;
 
-import lombok.Synchronized;
 import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
 
-@Slf4j
 @UtilityClass
 public class EmlProcessingUtils {
 
     // Style constants
-    private final int DEFAULT_FONT_SIZE = 12;
-    private final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
-    private final float DEFAULT_LINE_HEIGHT = 1.4f;
-    private final String DEFAULT_ZOOM = "1.0";
-    private final String DEFAULT_TEXT_COLOR = "#202124";
-    private final String DEFAULT_BACKGROUND_COLOR = "#ffffff";
-    private final String DEFAULT_BORDER_COLOR = "#e8eaed";
-    private final String ATTACHMENT_BACKGROUND_COLOR = "#f9f9f9";
-    private final String ATTACHMENT_BORDER_COLOR = "#eeeeee";
+    private static final int DEFAULT_FONT_SIZE = 12;
+    private static final String DEFAULT_FONT_FAMILY = "Helvetica, sans-serif";
+    private static final float DEFAULT_LINE_HEIGHT = 1.4f;
+    private static final String DEFAULT_ZOOM = "1.0";
+    private static final String DEFAULT_TEXT_COLOR = "#202124";
+    private static final String DEFAULT_BACKGROUND_COLOR = "#ffffff";
+    private static final String DEFAULT_BORDER_COLOR = "#e8eaed";
+    private static final String ATTACHMENT_BACKGROUND_COLOR = "#f9f9f9";
+    private static final String ATTACHMENT_BORDER_COLOR = "#eeeeee";
 
-    private final String CSS_RESOURCE_PATH = "templates/email-pdf-styles.css";
-    private final int EML_CHECK_LENGTH = 8192;
-    private final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
-    // MSG file magic bytes (Compound File Binary Format / OLE2)
-    // D0 CF 11 E0 A1 B1 1A E1
-    private final byte[] MSG_MAGIC_BYTES = {
-        (byte) 0xD0, (byte) 0xCF, (byte) 0x11, (byte) 0xE0,
-        (byte) 0xA1, (byte) 0xB1, (byte) 0x1A, (byte) 0xE1
-    };
-    private final Map<String, String> EXTENSION_TO_MIME_TYPE =
+    private static final int EML_CHECK_LENGTH = 8192;
+    private static final int MIN_HEADER_COUNT_FOR_VALID_EML = 2;
+
+    // MIME type detection
+    private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
             Map.of(
                     ".png", MediaType.IMAGE_PNG_VALUE,
                     ".jpg", MediaType.IMAGE_JPEG_VALUE,
@@ -56,36 +45,18 @@ public class EmlProcessingUtils {
                     ".ico", "image/x-icon",
                     ".tiff", "image/tiff",
                     ".tif", "image/tiff");
-    private volatile String cachedCssContent = null;
 
-    public void validateEmlInput(byte[] emlBytes) {
+    public static void validateEmlInput(byte[] emlBytes) {
         if (emlBytes == null || emlBytes.length == 0) {
             throw ExceptionUtils.createEmlEmptyException();
         }
 
-        if (isMsgFile(emlBytes)) {
-            return; // Valid MSG file, no further EML validation needed
-        }
-
         if (isInvalidEmlFormat(emlBytes)) {
             throw ExceptionUtils.createEmlInvalidFormatException();
         }
     }
 
-    public boolean isMsgFile(byte[] fileBytes) {
-        if (fileBytes == null || fileBytes.length < MSG_MAGIC_BYTES.length) {
-            return false;
-        }
-
-        for (int i = 0; i < MSG_MAGIC_BYTES.length; i++) {
-            if (fileBytes[i] != MSG_MAGIC_BYTES[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean isInvalidEmlFormat(byte[] emlBytes) {
+    private static boolean isInvalidEmlFormat(byte[] emlBytes) {
         try {
             int checkLength = Math.min(emlBytes.length, EML_CHECK_LENGTH);
             String content;
@@ -130,7 +101,7 @@ public class EmlProcessingUtils {
         }
     }
 
-    public String generateEnhancedEmailHtml(
+    public static String generateEnhancedEmailHtml(
             EmlParser.EmailContent content,
             EmlToPdfRequest request,
             CustomHtmlSanitizer customHtmlSanitizer) {
@@ -174,7 +145,7 @@ public class EmlProcessingUtils {
             html.append(
                     String.format(
                             Locale.ROOT,
-                            "<div><strong>CC:</strong> %s</div>%n",
+                            "<div><strong>CC:</strong> %s</div>\n",
                             sanitizeText(content.getCc(), customHtmlSanitizer)));
         }
 
@@ -182,7 +153,7 @@ public class EmlProcessingUtils {
             html.append(
                     String.format(
                             Locale.ROOT,
-                            "<div><strong>BCC:</strong> %s</div>%n",
+                            "<div><strong>BCC:</strong> %s</div>\n",
                             sanitizeText(content.getBcc(), customHtmlSanitizer)));
         }
 
@@ -190,19 +161,19 @@ public class EmlProcessingUtils {
             html.append(
                     String.format(
                             Locale.ROOT,
-                            "<div><strong>Date:</strong> %s</div>%n",
+                            "<div><strong>Date:</strong> %s</div>\n",
                             PdfAttachmentHandler.formatEmailDate(content.getDate())));
         } else if (content.getDateString() != null && !content.getDateString().trim().isEmpty()) {
             html.append(
                     String.format(
                             Locale.ROOT,
-                            "<div><strong>Date:</strong> %s</div>%n",
+                            "<div><strong>Date:</strong> %s</div>\n",
                             sanitizeText(content.getDateString(), customHtmlSanitizer)));
         }
 
-        html.append(String.format(Locale.ROOT, "</div></div>%n"));
+        html.append("</div></div>\n");
 
-        html.append(String.format(Locale.ROOT, "<div class=\"email-body\">%n"));
+        html.append("<div class=\"email-body\">\n");
         if (content.getHtmlBody() != null && !content.getHtmlBody().trim().isEmpty()) {
             String processedHtml =
                     processEmailHtmlBody(content.getHtmlBody(), content, customHtmlSanitizer);
@@ -216,17 +187,17 @@ public class EmlProcessingUtils {
         } else {
             html.append("<div class=\"no-content\"><p><em>No content available</em></p></div>");
         }
-        html.append(String.format(Locale.ROOT, "</div>%n"));
+        html.append("</div>\n");
 
         if (content.getAttachmentCount() > 0 || !content.getAttachments().isEmpty()) {
-            appendAttachmentsSection(html, content, request);
+            appendAttachmentsSection(html, content, request, customHtmlSanitizer);
         }
 
-        html.append(String.format(Locale.ROOT, "</div>%n</body></html>"));
+        html.append("</div>\n</body></html>");
         return html.toString();
     }
 
-    public String processEmailHtmlBody(
+    public static String processEmailHtmlBody(
             String htmlBody,
             EmlParser.EmailContent emailContent,
             CustomHtmlSanitizer customHtmlSanitizer) {
@@ -253,7 +224,8 @@ public class EmlProcessingUtils {
         return processed;
     }
 
-    public String convertTextToHtml(String textBody, CustomHtmlSanitizer customHtmlSanitizer) {
+    public static String convertTextToHtml(
+            String textBody, CustomHtmlSanitizer customHtmlSanitizer) {
         if (textBody == null) return "";
 
         String html =
@@ -283,25 +255,129 @@ public class EmlProcessingUtils {
         return html;
     }
 
-    private void appendEnhancedStyles(StringBuilder html) {
-        html.append(
+    private static void appendEnhancedStyles(StringBuilder html) {
+        String css =
                 String.format(
                         Locale.ROOT,
                         """
-                        :root {
-                          --font-family: %s;
-                          --font-size: %dpx;
-                          --line-height: %s;
-                          --text-color: %s;
-                          --bg-color: %s;
-                          --border-color: %s;
-                          --header-font-size: %dpx;
-                          --meta-font-size: %dpx;
-                          --attachment-bg: %s;
-                          --attachment-border: %s;
-                          --attachment-header-size: %dpx;
-                          --attachment-detail-size: %dpx;
-                          --note-font-size: %dpx;
+                        body {
+                          font-family: %s;
+                          font-size: %dpx;
+                          line-height: %s;
+                          color: %s;
+                          margin: 0;
+                          padding: 16px;
+                          background-color: %s;
+                        }
+
+                        .email-container {
+                          width: 100%%;
+                          max-width: 100%%;
+                          margin: 0 auto;
+                        }
+
+                        .email-header {
+                          padding-bottom: 10px;
+                          border-bottom: 1px solid %s;
+                          margin-bottom: 10px;
+                        }
+
+                        .email-header h1 {
+                          margin: 0 0 10px 0;
+                          font-size: %dpx;
+                          font-weight: bold;
+                        }
+
+                        .email-meta div {
+                          margin-bottom: 2px;
+                          font-size: %dpx;
+                        }
+
+                        .email-body {
+                          word-wrap: break-word;
+                        }
+
+                        .attachment-section {
+                          margin-top: 15px;
+                          padding: 10px;
+                          background-color: %s;
+                          border: 1px solid %s;
+                          border-radius: 3px;
+                        }
+
+                        .attachment-section h3 {
+                          margin: 0 0 8px 0;
+                          font-size: %dpx;
+                        }
+
+                        .attachment-item {
+                          padding: 5px 0;
+                        }
+
+                        .attachment-icon {
+                          margin-right: 5px;
+                        }
+
+                        .attachment-details, .attachment-type {
+                          font-size: %dpx;
+                          color: #555555;
+                        }
+
+                        .attachment-inclusion-note, .attachment-info-note {
+                          margin-top: 8px;
+                          padding: 6px;
+                          font-size: %dpx;
+                          border-radius: 3px;
+                        }
+
+                        .attachment-inclusion-note {
+                          background-color: #e6ffed;
+                          border: 1px solid #d4f7dc;
+                          color: #006420;
+                        }
+
+                        .attachment-info-note {
+                          background-color: #fff9e6;
+                          border: 1px solid #fff0c2;
+                          color: #664d00;
+                        }
+
+                        .attachment-link-container {
+                          display: flex;
+                          align-items: center;
+                          padding: 8px;
+                          background-color: #f8f9fa;
+                          border: 1px solid #dee2e6;
+                          border-radius: 4px;
+                          margin: 4px 0;
+                        }
+
+                        .attachment-link-container:hover {
+                          background-color: #e9ecef;
+                        }
+
+                        .attachment-note {
+                          font-size: %dpx;
+                          color: #6c757d;
+                          font-style: italic;
+                          margin-left: 8px;
+                        }
+
+                        .no-content {
+                          padding: 20px;
+                          text-align: center;
+                          color: #666;
+                          font-style: italic;
+                        }
+
+                        .text-body {
+                          white-space: pre-wrap;
+                        }
+
+                        img {
+                          max-width: 100%%;
+                          height: auto;
+                          display: block;
                         }
                         """,
                         DEFAULT_FONT_FAMILY,
@@ -310,70 +386,29 @@ public class EmlProcessingUtils {
                         DEFAULT_TEXT_COLOR,
                         DEFAULT_BACKGROUND_COLOR,
                         DEFAULT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 6,
-                        DEFAULT_FONT_SIZE,
+                        DEFAULT_FONT_SIZE + 4,
+                        DEFAULT_FONT_SIZE - 1,
                         ATTACHMENT_BACKGROUND_COLOR,
                         ATTACHMENT_BORDER_COLOR,
-                        DEFAULT_FONT_SIZE + 2,
-                        DEFAULT_FONT_SIZE - 1,
-                        DEFAULT_FONT_SIZE - 1));
+                        DEFAULT_FONT_SIZE + 1,
+                        DEFAULT_FONT_SIZE - 2,
+                        DEFAULT_FONT_SIZE - 2,
+                        DEFAULT_FONT_SIZE - 3);
 
-        html.append(loadEmailStyles());
+        html.append(css);
     }
 
-    @Synchronized
-    private String loadEmailStyles() {
-        if (cachedCssContent != null) {
-            return cachedCssContent;
-        }
-
-        try {
-            ClassPathResource resource = new ClassPathResource(CSS_RESOURCE_PATH);
-            try (InputStream inputStream = resource.getInputStream()) {
-                cachedCssContent = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-                return cachedCssContent;
-            }
-        } catch (IOException e) {
-            log.warn("Failed to load email CSS from resource, using fallback: {}", e.getMessage());
-            cachedCssContent = getFallbackStyles(); // Cache fallback to avoid repeated attempts
-            return cachedCssContent;
-        }
-    }
-
-    private String getFallbackStyles() {
-        return """
-            /* Minimal fallback - main CSS resource failed to load */
-            body {
-                font-family: var(--font-family, Helvetica, sans-serif);
-                font-size: var(--font-size, 12px);
-                line-height: var(--line-height, 1.4);
-                color: var(--text-color, #202124);
-                margin: 0;
-                padding: 20px;
-                word-wrap: break-word;
-            }
-            .email-container { max-width: 100%; }
-            .email-header { border-bottom: 1px solid #ccc; margin-bottom: 16px; padding-bottom: 12px; }
-            .email-header h1 { margin: 0 0 8px 0; font-size: 18px; }
-            .email-meta { font-size: 12px; color: #666; }
-            .email-body { line-height: 1.6; }
-            .attachment-section { margin-top: 20px; padding: 12px; background: #f5f5f5; border-radius: 4px; }
-            .attachment-item { padding: 6px 0; border-bottom: 1px solid #ddd; }
-            .no-content { padding: 20px; text-align: center; color: #888; font-style: italic; }
-            img { max-width: 100%; height: auto; }
-            """;
-    }
-
-    private void appendAttachmentsSection(
-            StringBuilder html, EmlParser.EmailContent content, EmlToPdfRequest request) {
-        html.append(String.format(Locale.ROOT, "<div class=\"attachment-section\">%n"));
+    private static void appendAttachmentsSection(
+            StringBuilder html,
+            EmlParser.EmailContent content,
+            EmlToPdfRequest request,
+            CustomHtmlSanitizer customHtmlSanitizer) {
+        html.append("<div class=\"attachment-section\">\n");
         int displayedAttachmentCount =
                 content.getAttachmentCount() > 0
                         ? content.getAttachmentCount()
                         : content.getAttachments().size();
-        html.append(
-                String.format(
-                        Locale.ROOT, "<h3>Attachments (%d)</h3>%n", displayedAttachmentCount));
+        html.append("<h3>Attachments (").append(displayedAttachmentCount).append(")</h3>\n");
 
         if (!content.getAttachments().isEmpty()) {
             for (int i = 0; i < content.getAttachments().size(); i++) {
@@ -426,10 +461,10 @@ public class EmlProcessingUtils {
                     </div>
                     """);
         }
-        html.append(String.format(Locale.ROOT, "</div>%n"));
+        html.append("</div>\n");
     }
 
-    public HTMLToPdfRequest createHtmlRequest(EmlToPdfRequest request) {
+    public static HTMLToPdfRequest createHtmlRequest(EmlToPdfRequest request) {
         HTMLToPdfRequest htmlRequest = new HTMLToPdfRequest();
 
         if (request != null) {
@@ -440,7 +475,7 @@ public class EmlProcessingUtils {
         return htmlRequest;
     }
 
-    public String detectMimeType(String filename, String existingMimeType) {
+    public static String detectMimeType(String filename, String existingMimeType) {
         if (existingMimeType != null && !existingMimeType.isEmpty()) {
             return existingMimeType;
         }
@@ -457,7 +492,7 @@ public class EmlProcessingUtils {
         return MediaType.IMAGE_PNG_VALUE; // Default MIME type
     }
 
-    public String decodeUrlEncoded(String encoded) {
+    public static String decodeUrlEncoded(String encoded) {
         try {
             return java.net.URLDecoder.decode(encoded, StandardCharsets.UTF_8);
         } catch (Exception e) {
@@ -465,7 +500,7 @@ public class EmlProcessingUtils {
         }
     }
 
-    public String decodeMimeHeader(String encodedText) {
+    public static String decodeMimeHeader(String encodedText) {
         if (encodedText == null || encodedText.trim().isEmpty()) {
             return encodedText;
         }
@@ -531,7 +566,7 @@ public class EmlProcessingUtils {
         }
     }
 
-    private String decodeQuotedPrintable(String encodedText, String charset) {
+    private static String decodeQuotedPrintable(String encodedText, String charset) {
         StringBuilder result = new StringBuilder();
         for (int i = 0; i < encodedText.length(); i++) {
             char c = encodedText.charAt(i);
@@ -574,7 +609,7 @@ public class EmlProcessingUtils {
         }
     }
 
-    public String escapeHtml(String text) {
+    public static String escapeHtml(String text) {
         if (text == null) return "";
         return text.replace("&", "&amp;")
                 .replace("<", "&lt;")
@@ -583,7 +618,7 @@ public class EmlProcessingUtils {
                 .replace("'", "&#39;");
     }
 
-    public String sanitizeText(String text, CustomHtmlSanitizer customHtmlSanitizer) {
+    public static String sanitizeText(String text, CustomHtmlSanitizer customHtmlSanitizer) {
         if (customHtmlSanitizer != null) {
             return customHtmlSanitizer.sanitize(text);
         } else {
@@ -591,7 +626,7 @@ public class EmlProcessingUtils {
         }
     }
 
-    public String simplifyHtmlContent(String htmlContent) {
+    public static String simplifyHtmlContent(String htmlContent) {
         String simplified =
                 RegexPatternUtils.getInstance()
                         .getScriptTagPattern()

app/common/src/main/java/stirling/software/common/util/GeneralUtils.java

@@ -4,8 +4,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
@@ -40,10 +38,6 @@ public class GeneralUtils {
      */
     private static final int MAX_DNS_ADDRESSES = 20;
 
-    // Constants for size conversion
-    private static final BigDecimal KIB = BigDecimal.valueOf(1024L);
-    private static final BigDecimal LONG_MAX_DECIMAL = BigDecimal.valueOf(Long.MAX_VALUE);
-
     private final Set<String> DEFAULT_VALID_SCRIPTS = Set.of("png_to_webp.py", "split_photos.py");
     private final Set<String> DEFAULT_VALID_PIPELINE =
             Set.of(
@@ -545,26 +539,39 @@ public class GeneralUtils {
 
         try {
             if (sizeStr.endsWith("TB")) {
-                return toBytes(parseSizeValue(sizeStr.substring(0, sizeStr.length() - 2)), 4);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024L
+                                * 1024L
+                                * 1024L
+                                * 1024L);
             } else if (sizeStr.endsWith("GB")) {
-                return toBytes(parseSizeValue(sizeStr.substring(0, sizeStr.length() - 2)), 3);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024L
+                                * 1024L
+                                * 1024L);
             } else if (sizeStr.endsWith("MB")) {
-                return toBytes(parseSizeValue(sizeStr.substring(0, sizeStr.length() - 2)), 2);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024L
+                                * 1024L);
             } else if (sizeStr.endsWith("KB")) {
-                return toBytes(parseSizeValue(sizeStr.substring(0, sizeStr.length() - 2)), 1);
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024L);
             } else if (!sizeStr.isEmpty() && sizeStr.charAt(sizeStr.length() - 1) == 'B') {
-                return toBytes(parseSizeValue(sizeStr.substring(0, sizeStr.length() - 1)), 0);
+                return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
             } else {
                 // Use provided default unit or fall back to MB
                 String unit = defaultUnit != null ? defaultUnit.toUpperCase(Locale.ROOT) : "MB";
-                BigDecimal value = parseSizeValue(sizeStr);
+                double value = Double.parseDouble(sizeStr);
                 return switch (unit) {
-                    case "TB" -> toBytes(value, 4);
-                    case "GB" -> toBytes(value, 3);
-                    case "MB" -> toBytes(value, 2);
-                    case "KB" -> toBytes(value, 1);
-                    case "B" -> toBytes(value, 0);
-                    default -> toBytes(value, 2); // Default to MB
+                    case "TB" -> (long) (value * 1024L * 1024L * 1024L * 1024L);
+                    case "GB" -> (long) (value * 1024L * 1024L * 1024L);
+                    case "MB" -> (long) (value * 1024L * 1024L);
+                    case "KB" -> (long) (value * 1024L);
+                    case "B" -> (long) value;
+                    default -> (long) (value * 1024L * 1024L); // Default to MB
                 };
             }
         } catch (NumberFormatException e) {
@@ -583,30 +590,6 @@ public class GeneralUtils {
         return convertSizeToBytes(sizeStr, "MB");
     }
 
-    private Long toBytes(BigDecimal value, int powerOf1024) {
-        if (value == null) {
-            return null;
-        }
-        if (value.compareTo(BigDecimal.ZERO) < 0) {
-            log.warn("Size value cannot be negative: {}", value);
-            return null;
-        }
-        if (powerOf1024 < 0 || powerOf1024 > 4) {
-            throw new IllegalArgumentException("Invalid power for size conversion: " + powerOf1024);
-        }
-        BigDecimal multiplier = powerOf1024 == 0 ? BigDecimal.ONE : KIB.pow(powerOf1024);
-        BigDecimal bytes = value.multiply(multiplier).setScale(0, RoundingMode.DOWN);
-        if (bytes.compareTo(LONG_MAX_DECIMAL) > 0) {
-            log.warn("Size value too large to fit in long: {}", bytes);
-            return null;
-        }
-        return bytes.longValue();
-    }
-
-    private BigDecimal parseSizeValue(String value) {
-        return new BigDecimal(value);
-    }
-
     /* Validates if a string represents a valid size unit. */
     private boolean isValidSizeUnit(String unit) {
         // Use a precomputed Set for O(1) lookup, normalize using a locale-safe toUpperCase

app/common/src/main/java/stirling/software/common/util/PDFToFile.java

@@ -360,6 +360,8 @@ public class PDFToFile {
             Path inputFile, Path outputFile, String outputFormat, String libreOfficeFilter) {
         List<String> command = new ArrayList<>();
         command.add(runtimePathConfig.getUnoConvertPath());
+        command.add("--port");
+        command.add("2003");
         command.add("--convert-to");
         command.add(outputFormat);
         if (libreOfficeFilter != null && !libreOfficeFilter.isBlank()) {

app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java

@@ -6,12 +6,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
@@ -29,15 +26,11 @@ public class ProcessExecutor {
 
     private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
     private static ApplicationProperties applicationProperties = new ApplicationProperties();
-    private static volatile UnoServerPool unoServerPool;
     private final Semaphore semaphore;
     private final boolean liveUpdates;
     private long timeoutDuration;
-    private final Processes processType;
 
-    private ProcessExecutor(
-            Processes processType, int semaphoreLimit, boolean liveUpdates, long timeout) {
-        this.processType = processType;
+    private ProcessExecutor(int semaphoreLimit, boolean liveUpdates, long timeout) {
         this.semaphore = new Semaphore(semaphoreLimit);
         this.liveUpdates = liveUpdates;
         this.timeoutDuration = timeout;
@@ -180,15 +173,10 @@ public class ProcessExecutor {
                                                 .getTimeoutMinutes()
                                                 .getFfmpegTimeoutMinutes();
                             };
-                    return new ProcessExecutor(
-                            processType, semaphoreLimit, liveUpdates, timeoutMinutes);
+                    return new ProcessExecutor(semaphoreLimit, liveUpdates, timeoutMinutes);
                 });
     }
 
-    public static void setUnoServerPool(UnoServerPool pool) {
-        unoServerPool = pool;
-    }
-
     public ProcessExecutorResult runCommandWithOutputHandling(List<String> command)
             throws IOException, InterruptedException {
         return runCommandWithOutputHandling(command, null);
@@ -198,22 +186,11 @@ public class ProcessExecutor {
             List<String> command, File workingDirectory) throws IOException, InterruptedException {
         String messages = "";
         int exitCode = 1;
-        UnoServerPool.UnoServerLease unoLease = null;
-        boolean useSemaphore = true;
-        List<String> commandToRun = command;
-        if (shouldUseUnoServerPool(command)) {
-            unoLease = unoServerPool.acquireEndpoint();
-            commandToRun = applyUnoServerEndpoint(command, unoLease.getEndpoint());
-            useSemaphore = false;
-        }
-        if (useSemaphore) {
-            semaphore.acquire();
-        }
+        semaphore.acquire();
         try {
 
-            validateCommand(commandToRun);
-            log.info("Running command: {}", String.join(" ", commandToRun));
-            ProcessBuilder processBuilder = new ProcessBuilder(commandToRun);
+            log.info("Running command: {}", String.join(" ", command));
+            ProcessBuilder processBuilder = new ProcessBuilder(command);
 
             // Use the working directory if it's set
             if (workingDirectory != null) {
@@ -291,9 +268,7 @@ public class ProcessExecutor {
             outputReaderThread.join();
 
             boolean isQpdf =
-                    commandToRun != null
-                            && !commandToRun.isEmpty()
-                            && commandToRun.get(0).contains("qpdf");
+                    command != null && !command.isEmpty() && command.get(0).contains("qpdf");
 
             if (!outputLines.isEmpty()) {
                 String outputMessage = String.join("\n", outputLines);
@@ -334,195 +309,11 @@ public class ProcessExecutor {
                 }
             }
         } finally {
-            if (useSemaphore) {
-                semaphore.release();
-            }
-            if (unoLease != null) {
-                unoLease.close();
-            }
+            semaphore.release();
         }
         return new ProcessExecutorResult(exitCode, messages);
     }
 
-    private boolean shouldUseUnoServerPool(List<String> command) {
-        if (processType != Processes.LIBRE_OFFICE || unoServerPool == null) {
-            return false;
-        }
-        if (unoServerPool.isEmpty()) {
-            return false;
-        }
-        if (command == null || command.isEmpty()) {
-            return false;
-        }
-
-        // Check if this is a UNO conversion by looking for unoconvert executable
-        String executable = command.get(0);
-        if (executable != null) {
-            // Extract basename from path for matching
-            String basename = executable;
-            int lastSlash = Math.max(executable.lastIndexOf('/'), executable.lastIndexOf('\\'));
-            if (lastSlash >= 0) {
-                basename = executable.substring(lastSlash + 1);
-            }
-            // Strip .exe extension on Windows
-            if (basename.toLowerCase(java.util.Locale.ROOT).endsWith(".exe")) {
-                basename = basename.substring(0, basename.length() - 4);
-            }
-            // Match common unoconvert variants (but NOT soffice)
-            String lowerBasename = basename.toLowerCase(java.util.Locale.ROOT);
-            if (lowerBasename.contains("unoconvert") || lowerBasename.equals("unoconv")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private List<String> applyUnoServerEndpoint(
-            List<String> command,
-            ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint) {
-        if (endpoint == null || command == null || command.isEmpty()) {
-            return command;
-        }
-        List<String> updated = stripUnoEndpointArgs(command);
-        String host = endpoint.getHost();
-        int port = endpoint.getPort();
-        String hostLocation = endpoint.getHostLocation();
-        String protocol = endpoint.getProtocol();
-
-        // Normalize and validate host
-        if (host == null || host.isBlank()) {
-            host = "127.0.0.1";
-        }
-
-        // Normalize and validate port
-        if (port <= 0) {
-            port = 2003;
-        }
-
-        // Normalize and validate hostLocation (only auto|local|remote allowed)
-        if (hostLocation == null) {
-            hostLocation = "auto";
-        } else {
-            hostLocation = hostLocation.trim().toLowerCase(java.util.Locale.ROOT);
-            if (!Set.of("auto", "local", "remote").contains(hostLocation)) {
-                log.warn(
-                        "Invalid hostLocation '{}' for endpoint {}:{}, defaulting to 'auto'",
-                        hostLocation,
-                        host,
-                        port);
-                hostLocation = "auto";
-            }
-        }
-
-        // Normalize and validate protocol (only http|https allowed)
-        if (protocol == null) {
-            protocol = "http";
-        } else {
-            protocol = protocol.trim().toLowerCase(java.util.Locale.ROOT);
-            if (!Set.of("http", "https").contains(protocol)) {
-                log.warn(
-                        "Invalid protocol '{}' for endpoint {}:{}, defaulting to 'http'",
-                        protocol,
-                        host,
-                        port);
-                protocol = "http";
-            }
-        }
-
-        int insertIndex = Math.min(1, updated.size());
-        updated.add(insertIndex++, "--host");
-        updated.add(insertIndex++, host);
-        updated.add(insertIndex++, "--port");
-        updated.add(insertIndex++, String.valueOf(port));
-
-        // Only inject --host-location if non-default (for compatibility with older unoconvert)
-        if (!"auto".equals(hostLocation)) {
-            updated.add(insertIndex++, "--host-location");
-            updated.add(insertIndex++, hostLocation);
-        }
-
-        // Only inject --protocol if non-default (for compatibility with older unoconvert)
-        if (!"http".equals(protocol)) {
-            updated.add(insertIndex++, "--protocol");
-            updated.add(insertIndex, protocol);
-        }
-
-        return updated;
-    }
-
-    private List<String> stripUnoEndpointArgs(List<String> command) {
-        List<String> stripped = new ArrayList<>(command.size());
-        for (int i = 0; i < command.size(); i++) {
-            String arg = command.get(i);
-            if ("--host".equals(arg)
-                    || "--port".equals(arg)
-                    || "--host-location".equals(arg)
-                    || "--protocol".equals(arg)) {
-                i++;
-                continue;
-            }
-            if (arg != null
-                    && (arg.startsWith("--host=")
-                            || arg.startsWith("--port=")
-                            || arg.startsWith("--host-location=")
-                            || arg.startsWith("--protocol="))) {
-                continue;
-            }
-            stripped.add(arg);
-        }
-        return stripped;
-    }
-
-    private void validateCommand(List<String> command) {
-        if (command == null || command.isEmpty()) {
-            throw new IllegalArgumentException("Command must not be empty");
-        }
-
-        // Validate all arguments for null bytes and newlines (actual security concerns)
-        for (String arg : command) {
-            if (arg == null) {
-                throw new IllegalArgumentException("Command contains null argument");
-            }
-            if (arg.indexOf('\0') >= 0 || arg.indexOf('\n') >= 0 || arg.indexOf('\r') >= 0) {
-                throw new IllegalArgumentException("Command contains invalid characters");
-            }
-        }
-
-        // Validate executable (first argument)
-        String executable = command.get(0);
-        if (executable == null || executable.isBlank()) {
-            throw new IllegalArgumentException("Command executable must not be empty");
-        }
-
-        // Check for path traversal in executable
-        if (executable.contains("..")) {
-            throw new IllegalArgumentException(
-                    "Command executable contains path traversal: " + executable);
-        }
-
-        // For absolute paths, verify the file exists and is executable
-        if (executable.contains("/") || executable.contains("\\")) {
-            Path execPath;
-            try {
-                execPath = Path.of(executable);
-            } catch (Exception e) {
-                throw new IllegalArgumentException("Invalid executable path: " + executable, e);
-            }
-
-            if (!Files.exists(execPath)) {
-                throw new IllegalArgumentException(
-                        "Command executable does not exist: " + executable);
-            }
-
-            if (!Files.isRegularFile(execPath)) {
-                throw new IllegalArgumentException(
-                        "Command executable is not a regular file: " + executable);
-            }
-        }
-        // For relative paths, trust that PATH resolution will work or fail appropriately
-    }
-
     public enum Processes {
         LIBRE_OFFICE,
         PDFTOHTML,

app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java

@@ -38,12 +38,12 @@ public class RequestUriUtils {
         }
 
         // Specific static files bundled with the frontend
-        if ("/robots.txt".equals(normalizedUri)
-                || "/favicon.ico".equals(normalizedUri)
-                || "/manifest.json".equals(normalizedUri)
-                || "/site.webmanifest".equals(normalizedUri)
-                || "/manifest-classic.json".equals(normalizedUri)
-                || "/index.html".equals(normalizedUri)) {
+        if (normalizedUri.equals("/robots.txt")
+                || normalizedUri.equals("/favicon.ico")
+                || normalizedUri.equals("/manifest.json")
+                || normalizedUri.equals("/site.webmanifest")
+                || normalizedUri.equals("/manifest-classic.json")
+                || normalizedUri.equals("/index.html")) {
             return true;
         }
 
@@ -173,12 +173,6 @@ public class RequestUriUtils {
                         "/api/v1/ui-data/footer-info") // Public footer configuration
                 || trimmedUri.startsWith("/api/v1/invite/validate")
                 || trimmedUri.startsWith("/api/v1/invite/accept")
-                // Health Endoints
-                || trimmedUri.startsWith("/actuator/health")
-                || trimmedUri.startsWith("/health")
-                || trimmedUri.startsWith("/healthz")
-                || trimmedUri.startsWith("/liveness")
-                || trimmedUri.startsWith("/readiness")
                 || trimmedUri.startsWith(
                         "/api/v1/mobile-scanner/") // Mobile scanner endpoints (no auth)
                 || trimmedUri.startsWith("/v1/api-docs");

app/common/src/main/java/stirling/software/common/util/SvgSanitizer.java

@@ -1,280 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.service.SsrfProtectionService;
-
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class SvgSanitizer {
-
-    private static final Set<String> DANGEROUS_ELEMENTS =
-            Set.of("script", "foreignobject", "iframe", "object", "embed", "handler", "listener");
-    private static final Set<String> URL_ATTRIBUTES = Set.of("href", "xlink:href", "src", "data");
-    private static final Pattern JAVASCRIPT_URL_PATTERN =
-            Pattern.compile("^\\s*javascript\\s*:", Pattern.CASE_INSENSITIVE);
-    private static final Pattern DATA_SCRIPT_PATTERN =
-            Pattern.compile(
-                    "^\\s*data\\s*:[^,]*(?:script|javascript|vbscript)", Pattern.CASE_INSENSITIVE);
-    private final SsrfProtectionService ssrfProtectionService;
-    private final ApplicationProperties applicationProperties;
-
-    public byte[] sanitize(byte[] svgBytes) throws IOException {
-        if (svgBytes == null || svgBytes.length == 0) {
-            throw new IOException("SVG input is empty or null");
-        }
-
-        if (applicationProperties.getSystem().isDisableSanitize()) {
-            log.debug("SVG sanitization disabled by configuration");
-            return svgBytes;
-        }
-
-        try {
-            Document doc = parseSecurely(svgBytes);
-            Element root = doc.getDocumentElement();
-            if (root == null) {
-                throw new IOException("SVG document has no root element");
-            }
-
-            sanitizeNode(root);
-
-            byte[] result = serializeDocument(doc);
-            if (result == null || result.length == 0) {
-                throw new IOException("SVG sanitization produced empty output");
-            }
-
-            return result;
-        } catch (ParserConfigurationException | SAXException | TransformerException e) {
-            throw new IOException("Failed to sanitize SVG content", e);
-        }
-    }
-
-    private Document parseSecurely(byte[] svgBytes)
-            throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-
-        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
-        factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
-        factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-
-        factory.setXIncludeAware(false);
-        factory.setExpandEntityReferences(false);
-        factory.setNamespaceAware(true);
-
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        return builder.parse(new ByteArrayInputStream(svgBytes));
-    }
-
-    private void sanitizeNode(Node node) {
-        if (node == null) {
-            return;
-        }
-
-        NodeList children = node.getChildNodes();
-        Set<Node> nodesToRemove = new HashSet<>();
-
-        for (int i = 0; i < children.getLength(); i++) {
-            Node child = children.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE) {
-                String localName = child.getLocalName();
-                if (localName == null) {
-                    localName = child.getNodeName();
-                }
-
-                if (isDangerousElement(localName)) {
-                    log.warn("Removing dangerous SVG element: {}", localName);
-                    nodesToRemove.add(child);
-                } else {
-                    sanitizeNode(child);
-                }
-            }
-        }
-
-        for (Node toRemove : nodesToRemove) {
-            node.removeChild(toRemove);
-        }
-
-        if (node.getNodeType() == Node.ELEMENT_NODE) {
-            sanitizeAttributes((Element) node);
-        }
-    }
-
-    private void sanitizeAttributes(Element element) {
-        NamedNodeMap attributes = element.getAttributes();
-        Set<String> attributesToRemove = new HashSet<>();
-
-        for (int i = 0; i < attributes.getLength(); i++) {
-            Node attr = attributes.item(i);
-            String attrName = attr.getNodeName().toLowerCase();
-            String attrValue = attr.getNodeValue();
-
-            if (isEventHandler(attrName)) {
-                log.warn("Removing event handler attribute: {}", attrName);
-                attributesToRemove.add(attr.getNodeName());
-                continue;
-            }
-
-            if (isUrlAttribute(attrName)) {
-                if (isDangerousUrl(attrValue)) {
-                    log.warn(
-                            "Removing dangerous URL in attribute {}: {}",
-                            attrName,
-                            truncateForLog(attrValue));
-                    attributesToRemove.add(attr.getNodeName());
-                    continue;
-                }
-
-                if (isExternalUrl(attrValue) && !isUrlAllowed(attrValue)) {
-                    log.warn(
-                            "Removing SSRF-blocked URL in attribute {}: {}",
-                            attrName,
-                            truncateForLog(attrValue));
-                    attributesToRemove.add(attr.getNodeName());
-                }
-            }
-        }
-
-        for (String attrName : attributesToRemove) {
-            element.removeAttribute(attrName);
-        }
-    }
-
-    private boolean isDangerousElement(String localName) {
-        return DANGEROUS_ELEMENTS.contains(localName.toLowerCase());
-    }
-
-    private boolean isEventHandler(String attrName) {
-        return attrName.startsWith("on");
-    }
-
-    private boolean isUrlAttribute(String attrName) {
-        return URL_ATTRIBUTES.contains(attrName.toLowerCase())
-                || attrName.toLowerCase().endsWith(":href");
-    }
-
-    private boolean isDangerousUrl(String url) {
-        if (url == null || url.trim().isEmpty()) {
-            return false;
-        }
-
-        String normalized = normalizeUrl(url);
-
-        if (JAVASCRIPT_URL_PATTERN.matcher(normalized).find()) {
-            return true;
-        }
-
-        if (DATA_SCRIPT_PATTERN.matcher(normalized).find()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private String normalizeUrl(String url) {
-        if (url == null) {
-            return "";
-        }
-
-        String result = url.trim();
-
-        result = result.replaceAll("\u0000", "");
-
-        for (int i = 0; i < 3; i++) {
-            try {
-                String decoded = URLDecoder.decode(result, StandardCharsets.UTF_8);
-                if (decoded.equals(result)) {
-                    break; // No more decoding needed
-                }
-                result = decoded;
-            } catch (Exception e) {
-                log.debug("Failed to decode URL, continuing with current value", e);
-                break;
-            }
-        }
-
-        return result.toLowerCase();
-    }
-
-    private boolean isExternalUrl(String url) {
-        if (url == null || url.trim().isEmpty()) {
-            return false;
-        }
-
-        String normalized = normalizeUrl(url);
-
-        if (normalized.startsWith("#")) {
-            return false;
-        }
-
-        if (normalized.startsWith("data:")) {
-            return false;
-        }
-
-        return normalized.startsWith("http://")
-                || normalized.startsWith("https://")
-                || normalized.startsWith("//")
-                || normalized.startsWith("file:");
-    }
-
-    private boolean isUrlAllowed(String url) {
-        if (ssrfProtectionService == null) {
-            return true;
-        }
-        return ssrfProtectionService.isUrlAllowed(url);
-    }
-
-    private byte[] serializeDocument(Document doc) throws TransformerException {
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
-        Transformer transformer = transformerFactory.newTransformer();
-        transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-        transformer.setOutputProperty(OutputKeys.INDENT, "no");
-        transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "no");
-
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        transformer.transform(new DOMSource(doc), new StreamResult(outputStream));
-
-        return outputStream.toByteArray();
-    }
-
-    private String truncateForLog(String value) {
-        if (value == null) {
-            return "null";
-        }
-        return value.length() > 50 ? value.substring(0, 50) + "..." : value;
-    }
-}

app/common/src/main/java/stirling/software/common/util/UnoServerPool.java

@@ -1,85 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import stirling.software.common.model.ApplicationProperties;
-
-public class UnoServerPool {
-
-    private final List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints;
-    private final BlockingQueue<Integer> availableIndices;
-
-    public UnoServerPool(List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints) {
-        if (endpoints == null || endpoints.isEmpty()) {
-            this.endpoints = Collections.emptyList();
-            this.availableIndices = new LinkedBlockingQueue<>();
-        } else {
-            this.endpoints = new ArrayList<>(endpoints);
-            this.availableIndices = new LinkedBlockingQueue<>();
-            // Initialize queue with all endpoint indices
-            for (int i = 0; i < this.endpoints.size(); i++) {
-                this.availableIndices.offer(i);
-            }
-        }
-    }
-
-    public boolean isEmpty() {
-        return endpoints.isEmpty();
-    }
-
-    public UnoServerLease acquireEndpoint() throws InterruptedException {
-        if (endpoints.isEmpty()) {
-            return new UnoServerLease(defaultEndpoint(), null, this);
-        }
-
-        // Block until an endpoint index becomes available
-        Integer index = availableIndices.take();
-        return new UnoServerLease(endpoints.get(index), index, this);
-    }
-
-    private void releaseEndpoint(Integer index) {
-        if (index != null) {
-            availableIndices.offer(index);
-        }
-    }
-
-    private static ApplicationProperties.ProcessExecutor.UnoServerEndpoint defaultEndpoint() {
-        return new ApplicationProperties.ProcessExecutor.UnoServerEndpoint();
-    }
-
-    public static class UnoServerLease implements AutoCloseable {
-        private final ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint;
-        private final Integer index;
-        private final UnoServerPool pool;
-        private final AtomicBoolean closed = new AtomicBoolean(false);
-
-        public UnoServerLease(
-                ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint,
-                Integer index,
-                UnoServerPool pool) {
-            this.endpoint = endpoint;
-            this.index = index;
-            this.pool = pool;
-        }
-
-        public ApplicationProperties.ProcessExecutor.UnoServerEndpoint getEndpoint() {
-            return endpoint;
-        }
-
-        @Override
-        public void close() {
-            // Idempotent close: only release once even if close() called multiple times
-            if (!closed.compareAndSet(false, true)) {
-                return;
-            }
-            if (pool != null && index != null) {
-                pool.releaseEndpoint(index);
-            }
-        }
-    }
-}

app/common/src/main/resources/templates/email-pdf-styles.css

@@ -1,233 +0,0 @@
-*, *::before, *::after {
-  box-sizing: border-box;
-}
-
-html {
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-}
-
-body {
-  font-family: var(--font-family, 'Helvetica, sans-serif');
-  font-size: var(--font-size, 12px);
-  line-height: var(--line-height, 1.4);
-  color: var(--text-color, #202124);
-  margin: 0;
-  padding: 20px 24px;
-  background-color: var(--bg-color, #ffffff);
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-  hyphens: auto;
-}
-
-.email-container {
-  width: 100%;
-  max-width: 100%;
-  margin: 0 auto;
-}
-
-.email-header {
-  padding-bottom: 16px;
-  border-bottom: 2px solid var(--border-color, #e8eaed);
-  margin-bottom: 20px;
-}
-
-.email-header h1 {
-  margin: 0 0 12px 0;
-  font-size: var(--header-font-size, 18px);
-  font-weight: 600;
-  color: #1a1a1a;
-  line-height: 1.3;
-  word-break: break-word;
-}
-
-.email-meta {
-  font-size: var(--meta-font-size, 12px);
-  color: #5f6368;
-}
-
-.email-meta div {
-  margin-bottom: 4px;
-  line-height: 1.5;
-}
-
-.email-meta strong {
-  color: #3c4043;
-  font-weight: 600;
-  min-width: 50px;
-  display: inline-block;
-}
-.email-body {
-  word-wrap: break-word;
-  overflow-wrap: break-word;
-  line-height: 1.6;
-}
-
-.email-body p {
-  margin: 0 0 1em 0;
-}
-
-.email-body a {
-  color: #1a73e8;
-  text-decoration: underline;
-}
-.email-body table {
-  border-collapse: collapse;
-  width: auto;
-  max-width: 100%;
-  margin: 8px 0;
-}
-
-.email-body td,
-.email-body th {
-  padding: 8px 12px;
-  vertical-align: top;
-  border: 1px solid #e0e0e0;
-}
-.email-body ul,
-.email-body ol {
-  margin: 0.5em 0;
-  padding-left: 2em;
-}
-
-.email-body li {
-  margin-bottom: 0.25em;
-}
-.email-body blockquote {
-  margin: 1em 0;
-  padding: 0 0 0 16px;
-  border-left: 3px solid #dadce0;
-  color: #5f6368;
-}
-.email-body pre,
-.email-body code {
-  font-family: 'Consolas', 'Monaco', 'Courier New', monospace;
-  font-size: 0.9em;
-  background-color: #f8f9fa;
-  border-radius: 3px;
-}
-
-.email-body pre {
-  padding: 12px;
-  overflow-x: auto;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-.email-body code {
-  padding: 2px 6px;
-}
-.email-body hr {
-  border: none;
-  border-top: 1px solid #e0e0e0;
-  margin: 1.5em 0;
-}
-.attachment-section {
-  margin-top: 24px;
-  padding: 16px;
-  background-color: var(--attachment-bg, #f9f9f9);
-  border: 1px solid var(--attachment-border, #eeeeee);
-  border-radius: 6px;
-  page-break-inside: avoid;
-}
-
-.attachment-section h3 {
-  margin: 0 0 12px 0;
-  font-size: var(--attachment-header-size, 14px);
-  font-weight: 600;
-  color: #3c4043;
-}
-
-.attachment-item {
-  padding: 8px 0;
-  border-bottom: 1px solid #eeeeee;
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.attachment-item:last-child {
-  border-bottom: none;
-}
-
-.attachment-icon {
-  margin-right: 8px;
-  font-weight: bold;
-  color: #5f6368;
-}
-
-.attachment-name {
-  font-weight: 500;
-  color: #1a1a1a;
-  word-break: break-all;
-}
-
-.attachment-details,
-.attachment-type {
-  font-size: var(--attachment-detail-size, 11px);
-  color: #5f6368;
-  margin-left: 8px;
-}
-
-.attachment-info-note {
-  margin-top: 12px;
-  padding: 10px 12px;
-  font-size: var(--note-font-size, 11px);
-  border-radius: 4px;
-  background-color: #e8f0fe;
-  border: 1px solid #d2e3fc;
-  color: #1967d2;
-}
-
-.attachment-info-note p {
-  margin: 0;
-}
-.no-content {
-  padding: 32px 20px;
-  text-align: center;
-  color: #80868b;
-  font-style: italic;
-  background-color: #f8f9fa;
-  border-radius: 6px;
-}
-.text-body {
-  white-space: pre-wrap;
-  word-wrap: break-word;
-  font-family: inherit;
-  line-height: 1.6;
-}
-img {
-  max-width: 100%;
-  height: auto;
-  display: block;
-  margin: 8px 0;
-}
-@media print {
-  body {
-    padding: 0;
-    font-size: 11pt;
-  }
-
-  .email-header {
-    page-break-after: avoid;
-  }
-
-  .attachment-section {
-    page-break-inside: avoid;
-  }
-
-  a {
-    text-decoration: none;
-    color: inherit;
-  }
-}
-.email-body div[class*="signature"],
-.email-body table[class*="signature"] {
-  margin-top: 1.5em;
-  padding-top: 1em;
-  border-top: 1px solid #e0e0e0;
-  font-size: 0.95em;
-  color: #5f6368;
-}
-

app/common/src/test/java/stirling/software/common/model/InputStreamTemplateResourceTest.java

@@ -0,0 +1,88 @@
+package stirling.software.common.model;
+
+/* Commented out - InputStreamTemplateResource class removed with Thymeleaf migration
+ * This test will be removed when frontend migration to React is complete
+
+
+public class InputStreamTemplateResourceTest {
+
+    @Test
+    void gettersReturnProvidedFields() {
+        byte[] data = {1, 2, 3};
+        InputStream is = new ByteArrayInputStream(data);
+        String encoding = "UTF-8";
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, encoding);
+
+        assertSame(is, resource.getInputStream());
+        assertEquals(encoding, resource.getCharacterEncoding());
+    }
+
+    @Test
+    void fieldsAreFinal() throws NoSuchFieldException {
+        Field inputStreamField = InputStreamTemplateResource.class.getDeclaredField("inputStream");
+        Field characterEncodingField =
+                InputStreamTemplateResource.class.getDeclaredField("characterEncoding");
+
+        assertTrue(Modifier.isFinal(inputStreamField.getModifiers()));
+        assertTrue(Modifier.isFinal(characterEncodingField.getModifiers()));
+    }
+
+    @Test
+    void noSetterMethodsPresent() {
+        long setterCount =
+                Arrays.stream(InputStreamTemplateResource.class.getDeclaredMethods())
+                        .filter(method -> method.getName().startsWith("set"))
+                        .count();
+
+        assertEquals(0, setterCount, "InputStreamTemplateResource should not have setter methods");
+    }
+
+    @Test
+    void readerReturnsCorrectContent() throws Exception {
+        String content = "Hello, world!";
+        InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+
+        try (Reader reader = resource.reader()) {
+            char[] buffer = new char[content.length()];
+            int read = reader.read(buffer);
+            assertEquals(content.length(), read);
+            assertEquals(content, new String(buffer));
+        }
+    }
+
+    @Test
+    void relativeThrowsUnsupportedOperationException() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertThrows(UnsupportedOperationException.class, () -> resource.relative("other"));
+    }
+
+    @Test
+    void getDescriptionReturnsExpectedString() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertEquals("InputStream resource [Stream]", resource.getDescription());
+    }
+
+    @Test
+    void getBaseNameReturnsExpectedString() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertEquals("streamResource", resource.getBaseName());
+    }
+
+    @Test
+    void existsReturnsTrueWhenInputStreamNotNull() {
+        InputStream is = new ByteArrayInputStream(new byte[0]);
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(is, "UTF-8");
+        assertTrue(resource.exists());
+    }
+
+    @Test
+    void existsReturnsFalseWhenInputStreamIsNull() {
+        InputStreamTemplateResource resource = new InputStreamTemplateResource(null, "UTF-8");
+        assertFalse(resource.exists());
+    }
+}
+*/

app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java

@@ -439,7 +439,9 @@ class EmlToPdfTest {
                             "binary data");
 
             testEmailConversion(
-                    emlContent, new String[] {"Attachment Only Test", "data.bin"}, true);
+                    emlContent,
+                    new String[] {"Attachment Only Test", "data.bin", "No content available"},
+                    true);
         }
 
         @Test
@@ -467,13 +469,10 @@ class EmlToPdfTest {
         }
 
         @Test
-        @DisplayName("Should accept ISO-8859-1 charset declaration without errors")
+        @DisplayName("Should handle non-standard but valid character sets like ISO-8859-1")
         void handleIso88591Charset() throws IOException {
-            // Note: Uses ASCII content to test charset header parsing without
-            // platform-dependent encoding issues. Actual charset decoding is
-            // handled by Simple Java Mail library which is thoroughly tested upstream.
-            String subject = "Subject with ISO-8859-1 charset";
-            String body = "Body content encoded in ISO-8859-1";
+            String subject = "Subject with special characters: ñ é ü";
+            String body = "Body with special characters: ñ é ü";
 
             String emlContent =
                     createSimpleTextEmailWithCharset(
@@ -489,13 +488,8 @@ class EmlToPdfTest {
             String htmlResult = EmlToPdf.convertEmlToHtml(emlBytes, request);
 
             assertNotNull(htmlResult);
-            // Verify the core subject text is present (charset should be decoded properly)
-            assertTrue(
-                    htmlResult.contains("Subject with ISO-8859-1 charset"),
-                    "HTML should contain subject text");
-            assertTrue(
-                    htmlResult.contains("Body content encoded in ISO-8859-1"),
-                    "HTML should contain body text");
+            assertTrue(htmlResult.contains(subject));
+            assertTrue(htmlResult.contains(body));
         }
 
         @Test

app/common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java

@@ -16,14 +16,6 @@ class GeneralUtilsAdditionalTest {
         assertNull(GeneralUtils.convertSizeToBytes(null));
     }
 
-    @Test
-    void testConvertSizeToBytesEdgeCases() {
-        assertNull(GeneralUtils.convertSizeToBytes("-10MB"));
-        assertNull(GeneralUtils.convertSizeToBytes("10000000TB")); // overflow beyond long
-        assertEquals(1099511627776L, GeneralUtils.convertSizeToBytes("1TB"));
-        assertEquals(2684354560L, GeneralUtils.convertSizeToBytes("2.5GB"));
-    }
-
     @Test
     void testFormatBytes() {
         assertEquals("512 B", GeneralUtils.formatBytes(512));

app/common/src/test/java/stirling/software/common/util/ProcessExecutorTest.java

@@ -37,50 +37,21 @@ public class ProcessExecutorTest {
 
     @Test
     public void testRunCommandWithOutputHandling_Error() {
-        // Test with a command that will fail to execute (non-existent command)
+        // Mock the command to execute
         List<String> command = new ArrayList<>();
-        command.add("nonexistent-command-that-does-not-exist");
+        command.add("nonexistent-command");
 
-        // Execute the command and expect an IOException (command not found)
-        assertThrows(
-                IOException.class, () -> processExecutor.runCommandWithOutputHandling(command));
-    }
-
-    @Test
-    public void testRunCommandWithOutputHandling_PathTraversal() {
-        // Test that path traversal is blocked
-        List<String> command = new ArrayList<>();
-        command.add("../../../etc/passwd");
-
-        // Execute the command and expect an IllegalArgumentException
-        IllegalArgumentException thrown =
+        // Execute the command and expect an IOException
+        IOException thrown =
                 assertThrows(
-                        IllegalArgumentException.class,
+                        IOException.class,
                         () -> processExecutor.runCommandWithOutputHandling(command));
 
-        // Check the exception message
+        // Check the exception message to ensure it indicates the command was not found
         String errorMessage = thrown.getMessage();
         assertTrue(
-                errorMessage.contains("path traversal"),
-                "Unexpected error message: " + errorMessage);
-    }
-
-    @Test
-    public void testRunCommandWithOutputHandling_NullByte() {
-        // Test that null bytes are blocked
-        List<String> command = new ArrayList<>();
-        command.add("test\0command");
-
-        // Execute the command and expect an IllegalArgumentException
-        IllegalArgumentException thrown =
-                assertThrows(
-                        IllegalArgumentException.class,
-                        () -> processExecutor.runCommandWithOutputHandling(command));
-
-        // Check the exception message
-        String errorMessage = thrown.getMessage();
-        assertTrue(
-                errorMessage.contains("invalid characters"),
+                errorMessage.contains("error=2")
+                        || errorMessage.contains("No such file or directory"),
                 "Unexpected error message: " + errorMessage);
     }
 }

app/common/src/test/java/stirling/software/common/util/UnoServerPoolTest.java

@@ -1,207 +0,0 @@
-package stirling.software.common.util;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.jupiter.api.Test;
-
-import stirling.software.common.model.ApplicationProperties;
-
-public class UnoServerPoolTest {
-
-    @Test
-    void testEmptyPool() throws InterruptedException {
-        UnoServerPool pool = new UnoServerPool(Collections.emptyList());
-        assertTrue(pool.isEmpty(), "Pool with empty list should be empty");
-
-        UnoServerPool.UnoServerLease lease = pool.acquireEndpoint();
-        assertNotNull(lease, "Should return a default lease for empty pool");
-        assertNotNull(lease.getEndpoint(), "Default lease should have an endpoint");
-        lease.close(); // Should not throw
-    }
-
-    @Test
-    void testSingleEndpointAcquireRelease() throws InterruptedException {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints =
-                createEndpoints(1);
-        UnoServerPool pool = new UnoServerPool(endpoints);
-        assertFalse(pool.isEmpty(), "Pool should not be empty");
-
-        UnoServerPool.UnoServerLease lease = pool.acquireEndpoint();
-        assertNotNull(lease, "Should acquire endpoint");
-        assertEquals("127.0.0.1", lease.getEndpoint().getHost());
-        assertEquals(2003, lease.getEndpoint().getPort());
-
-        lease.close();
-    }
-
-    @Test
-    void testMultipleEndpointsDistribution() throws InterruptedException {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints =
-                createEndpoints(3);
-        UnoServerPool pool = new UnoServerPool(endpoints);
-
-        List<Integer> portsUsed = new ArrayList<>();
-
-        // Acquire all endpoints
-        try (UnoServerPool.UnoServerLease lease1 = pool.acquireEndpoint();
-                UnoServerPool.UnoServerLease lease2 = pool.acquireEndpoint();
-                UnoServerPool.UnoServerLease lease3 = pool.acquireEndpoint()) {
-
-            portsUsed.add(lease1.getEndpoint().getPort());
-            portsUsed.add(lease2.getEndpoint().getPort());
-            portsUsed.add(lease3.getEndpoint().getPort());
-
-            // All three endpoints should be in use (different ports)
-            assertEquals(3, portsUsed.stream().distinct().count(), "Should use all 3 endpoints");
-        }
-        // All released after try-with-resources
-    }
-
-    @Test
-    void testConcurrentAccess() throws InterruptedException {
-        int endpointCount = 3;
-        int threadCount = 10;
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints =
-                createEndpoints(endpointCount);
-        UnoServerPool pool = new UnoServerPool(endpoints);
-
-        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
-        CountDownLatch startLatch = new CountDownLatch(1);
-        CountDownLatch doneLatch = new CountDownLatch(threadCount);
-        AtomicInteger successCount = new AtomicInteger(0);
-
-        for (int i = 0; i < threadCount; i++) {
-            executor.submit(
-                    () -> {
-                        try {
-                            startLatch.await(); // Wait for all threads to be ready
-                            UnoServerPool.UnoServerLease lease = pool.acquireEndpoint();
-                            assertNotNull(lease, "Should acquire endpoint");
-                            Thread.sleep(10); // Simulate work
-                            lease.close();
-                            successCount.incrementAndGet();
-                        } catch (Exception e) {
-                            fail("Thread failed: " + e.getMessage());
-                        } finally {
-                            doneLatch.countDown();
-                        }
-                    });
-        }
-
-        startLatch.countDown(); // Start all threads
-        boolean finished = doneLatch.await(5, TimeUnit.SECONDS);
-        executor.shutdown();
-
-        assertTrue(finished, "All threads should complete within timeout");
-        assertEquals(
-                threadCount, successCount.get(), "All threads should successfully acquire/release");
-    }
-
-    @Test
-    void testBlockingBehavior() throws InterruptedException {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints =
-                createEndpoints(2);
-        UnoServerPool pool = new UnoServerPool(endpoints);
-
-        // Acquire both endpoints
-        UnoServerPool.UnoServerLease lease1 = pool.acquireEndpoint();
-        UnoServerPool.UnoServerLease lease2 = pool.acquireEndpoint();
-
-        AtomicInteger acquired = new AtomicInteger(0);
-        CountDownLatch acquireLatch = new CountDownLatch(1);
-
-        // Try to acquire a third endpoint in separate thread (should block)
-        Thread blockingThread =
-                new Thread(
-                        () -> {
-                            try {
-                                acquireLatch.countDown(); // Signal we're about to block
-                                UnoServerPool.UnoServerLease lease3 = pool.acquireEndpoint();
-                                acquired.incrementAndGet();
-                                lease3.close();
-                            } catch (InterruptedException e) {
-                                Thread.currentThread().interrupt();
-                            }
-                        });
-
-        blockingThread.start();
-        acquireLatch.await(); // Wait for thread to start
-        Thread.sleep(100); // Give it time to block
-
-        // Should still be 0 because thread is blocked
-        assertEquals(0, acquired.get(), "Third acquire should be blocked");
-
-        // Release one endpoint
-        lease1.close();
-        Thread.sleep(100); // Give blocked thread time to acquire
-
-        // Now the third acquire should succeed
-        assertEquals(1, acquired.get(), "Third acquire should succeed after release");
-
-        lease2.close();
-        blockingThread.join(1000);
-        assertFalse(blockingThread.isAlive(), "Thread should complete");
-    }
-
-    @Test
-    void testEndpointReuse() throws InterruptedException {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints =
-                createEndpoints(1);
-        UnoServerPool pool = new UnoServerPool(endpoints);
-
-        int port1, port2;
-
-        try (UnoServerPool.UnoServerLease lease1 = pool.acquireEndpoint()) {
-            port1 = lease1.getEndpoint().getPort();
-        }
-
-        try (UnoServerPool.UnoServerLease lease2 = pool.acquireEndpoint()) {
-            port2 = lease2.getEndpoint().getPort();
-        }
-
-        assertEquals(port1, port2, "Should reuse the same endpoint after release");
-    }
-
-    @Test
-    void testHostLocationAndProtocol() throws InterruptedException {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints = new ArrayList<>();
-        ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint =
-                new ApplicationProperties.ProcessExecutor.UnoServerEndpoint();
-        endpoint.setHost("remote.server");
-        endpoint.setPort(8080);
-        endpoint.setHostLocation("remote");
-        endpoint.setProtocol("https");
-        endpoints.add(endpoint);
-
-        UnoServerPool pool = new UnoServerPool(endpoints);
-
-        try (UnoServerPool.UnoServerLease lease = pool.acquireEndpoint()) {
-            assertEquals("remote.server", lease.getEndpoint().getHost());
-            assertEquals(8080, lease.getEndpoint().getPort());
-            assertEquals("remote", lease.getEndpoint().getHostLocation());
-            assertEquals("https", lease.getEndpoint().getProtocol());
-        }
-    }
-
-    private List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> createEndpoints(
-            int count) {
-        List<ApplicationProperties.ProcessExecutor.UnoServerEndpoint> endpoints = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            ApplicationProperties.ProcessExecutor.UnoServerEndpoint endpoint =
-                    new ApplicationProperties.ProcessExecutor.UnoServerEndpoint();
-            endpoint.setHost("127.0.0.1");
-            endpoint.setPort(2003 + (i * 2));
-            endpoints.add(endpoint);
-        }
-        return endpoints;
-    }
-}

app/core/build.gradle

@@ -2,6 +2,11 @@ apply plugin: 'org.springframework.boot'
 
 import org.apache.tools.ant.taskdefs.condition.Os
 
+repositories {
+    maven { url = 'https://build.shibboleth.net/maven/releases' }
+    maven { url = 'https://maven.pkg.github.com/jcefmaven/jcefmaven' }
+}
+
 configurations {
     developmentOnly
     runtimeClasspath {
@@ -38,6 +43,13 @@ spotless {
 }
 
 dependencies {
+    if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
+        || (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
+        && project.getProperty('STIRLING_PDF_DESKTOP_UI') != 'false')) {
+        implementation 'org.openjfx:javafx-controls:21'
+        implementation 'org.openjfx:javafx-swing:21'
+    }
+
     if (System.getenv('DISABLE_ADDITIONAL_FEATURES') != 'true'
         || (project.hasProperty('DISABLE_ADDITIONAL_FEATURES')
         && System.getProperty('DISABLE_ADDITIONAL_FEATURES') != 'true')) {
@@ -47,11 +59,10 @@ dependencies {
     implementation project(':common')
     implementation 'org.springframework.boot:spring-boot-starter-jetty'
     implementation 'com.posthog.java:posthog:1.2.0'
-    implementation 'org.telegram:telegrambots:6.9.7.1'
     implementation 'commons-io:commons-io:2.21.0'
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
-    implementation 'io.micrometer:micrometer-core:1.16.2'
+    implementation 'io.micrometer:micrometer-core:1.16.0'
     implementation 'com.google.zxing:core:3.5.4'
     implementation "org.commonmark:commonmark:$commonmarkVersion" // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark-ext-gfm-tables:$commonmarkVersion"
@@ -79,9 +90,6 @@ dependencies {
     // Batik
     implementation 'org.apache.xmlgraphics:batik-all:1.19'
 
-    // PDFBox Graphics2D bridge for Batik SVG to PDF conversion
-    implementation 'de.rototor.pdfbox:graphics2d:3.0.5'
-
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
@@ -108,8 +116,19 @@ sourceSets {
         resources {
             srcDirs += ['../configs']
         }
+        java {
+            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+                exclude 'stirling/software/SPDF/UI/impl/**'
+            }
+
+        }
     }
     test {
+        java {
+            if (System.getenv('STIRLING_PDF_DESKTOP_UI') == 'false') {
+                exclude 'stirling/software/SPDF/UI/impl/**'
+            }
+        }
     }
 
 }
@@ -188,14 +207,6 @@ tasks.register('npmInstall', Exec) {
             println "node_modules not found, will install..."
             return true
         }
-
-        // if required devDependency is missing, reinstall
-        def iconifyPkg = new File(frontendDir, 'node_modules/@iconify-json/material-symbols/package.json')
-        if (!iconifyPkg.exists()) {
-            println "@iconify-json/material-symbols missing, will reinstall..."
-            return true
-        }
-
         def packageJson = new File(frontendDir, 'package.json')
         def packageLock = new File(frontendDir, 'package-lock.json')
         def isOutdated = nodeModules.lastModified() < packageJson.lastModified() ||
@@ -221,7 +232,6 @@ tasks.register('npmBuild', Exec) {
     commandLine = Os.isFamily(Os.FAMILY_WINDOWS) ? ['cmd', '/c', 'npm', 'run', 'build'] : ['npm', 'run', 'build']
     dependsOn npmInstall
     inputs.dir(new File(frontendDir, 'src'))
-    inputs.dir(new File(frontendDir, 'public'))
     inputs.file(new File(frontendDir, 'package.json'))
     outputs.dir(frontendDistDir)
 

app/core/src/main/java/stirling/software/SPDF/SPDFApplication.java

@@ -20,6 +20,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 import io.github.pixee.security.SystemCommand;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -27,6 +28,7 @@ import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.configuration.ConfigInitializer;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.UrlUtils;
 
 @Slf4j
 @EnableScheduling
@@ -58,6 +60,19 @@ public class SPDFApplication {
 
         Properties props = new Properties();
 
+        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
+            System.setProperty("java.awt.headless", "false");
+            app.setHeadless(false);
+            props.put("java.awt.headless", "false");
+            props.put("spring.main.web-application-type", "servlet");
+
+            int desiredPort = 8080;
+            String port = UrlUtils.findAvailablePort(desiredPort);
+            props.put("server.port", port);
+            System.setProperty("server.port", port);
+            log.info("Desktop UI mode: Using port {}", port);
+        }
+
         app.setAdditionalProfiles(getActiveProfile(args));
 
         ConfigInitializer initializer = new ConfigInitializer();
@@ -138,6 +153,13 @@ public class SPDFApplication {
                     "Running in Tauri mode. Parent process PID: {}",
                     parentPid != null ? parentPid : "not set");
         }
+        // Desktop UI initialization removed - webBrowser dependency eliminated
+        // Keep backwards compatibility for STIRLING_PDF_DESKTOP_UI system property
+        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
+            log.info("Desktop UI mode enabled, but WebBrowser functionality has been removed");
+            // webBrowser.initWebUI(url); // Removed - desktop UI eliminated
+        }
+
         // Standard browser opening logic
         String browserOpenEnv = env.getProperty("BROWSER_OPEN");
         boolean browserOpen = browserOpenEnv != null && "true".equalsIgnoreCase(browserOpenEnv);
@@ -170,6 +192,14 @@ public class SPDFApplication {
         }
     }
 
+    @PreDestroy
+    public void cleanup() {
+        // webBrowser cleanup removed - desktop UI eliminated
+        // if (webBrowser != null) {
+        //     webBrowser.cleanup();
+        // }
+    }
+
     @EventListener
     public void onWebServerInitialized(WebServerInitializedEvent event) {
         int actualPort = event.getWebServer().getPort();

app/core/src/main/java/stirling/software/SPDF/config/TelegramBotConfig.java

@@ -1,18 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.telegram.telegrambots.meta.TelegramBotsApi;
-import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
-import org.telegram.telegrambots.updatesreceivers.DefaultBotSession;
-
-@Configuration
-@ConditionalOnProperty(prefix = "telegram", name = "enabled", havingValue = "true")
-public class TelegramBotConfig {
-
-    @Bean
-    public TelegramBotsApi telegramBotsApi() throws TelegramApiException {
-        return new TelegramBotsApi(DefaultBotSession.class);
-    }
-}

app/core/src/main/java/stirling/software/SPDF/controller/api/CropController.java

@@ -18,22 +18,26 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.general.CropPdfForm;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class CropController {
@@ -118,7 +122,7 @@ public class CropController {
         return r >= threshold && g >= threshold && b >= threshold;
     }
 
-    @AutoJobPostMapping(value = "/crop", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/crop", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(
             summary = "Crops a PDF document",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java

@@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -26,23 +27,21 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class EditTableOfContentsController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final ObjectMapper objectMapper;
 
-    @AutoJobPostMapping(
-            value = "/extract-bookmarks",
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/extract-bookmarks", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(
             summary = "Extract PDF Bookmarks",
             description = "Extracts bookmarks/table of contents from a PDF document as JSON.")
@@ -143,9 +142,7 @@ public class EditTableOfContentsController {
         return bookmark;
     }
 
-    @AutoJobPostMapping(
-            value = "/edit-table-of-contents",
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/edit-table-of-contents", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(
             summary = "Edit Table of Contents",
             description = "Add or edit bookmarks/table of contents in a PDF document.")

app/core/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java

@@ -14,32 +14,34 @@ import org.apache.pdfbox.util.Matrix;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralFormCopyUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class MultiPageLayoutController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
-    @AutoJobPostMapping(
-            value = "/multi-page-layout",
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/multi-page-layout", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(
             summary = "Merge multiple pages of a PDF document into a single page",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java

@@ -15,22 +15,26 @@ import org.apache.pdfbox.util.Matrix;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.general.ScalePagesRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class ScalePagesController {
@@ -112,7 +116,7 @@ public class ScalePagesController {
         return sizeMap;
     }
 
-    @AutoJobPostMapping(value = "/scale-pages", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/scale-pages", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(
             summary = "Change the size of a PDF page/document",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java

@@ -1,11 +1,14 @@
 package stirling.software.SPDF.controller.api;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import io.swagger.v3.oas.annotations.Hidden;
@@ -29,19 +32,16 @@ public class SettingsController {
 
     @AutoJobPostMapping("/update-enable-analytics")
     @Hidden
-    public ResponseEntity<Map<String, Object>> updateApiKey(@RequestParam Boolean enabled)
-            throws IOException {
+    public ResponseEntity<String> updateApiKey(@RequestParam Boolean enabled) throws IOException {
         if (applicationProperties.getSystem().getEnableAnalytics() != null) {
             return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
                     .body(
-                            Map.of(
-                                    "message",
-                                    "Setting has already been set, To adjust please edit "
-                                            + InstallationPathConfig.getSettingsPath()));
+                            "Setting has already been set, To adjust please edit "
+                                    + InstallationPathConfig.getSettingsPath());
         }
         GeneralUtils.saveKeyToSettings("system.enableAnalytics", enabled);
         applicationProperties.getSystem().setEnableAnalytics(enabled);
-        return ResponseEntity.ok(Map.of("message", "Updated"));
+        return ResponseEntity.ok("Updated");
     }
 
     @GetMapping("/get-endpoints-status")
@@ -49,4 +49,385 @@ public class SettingsController {
     public ResponseEntity<Map<String, Boolean>> getDisabledEndpoints() {
         return ResponseEntity.ok(endpointConfiguration.getEndpointStatuses());
     }
+
+    // ========== GENERAL SETTINGS ==========
+
+    @GetMapping("/admin/settings/general")
+    @Hidden
+    public ResponseEntity<Map<String, Object>> getGeneralSettings() {
+        Map<String, Object> settings = new HashMap<>();
+        settings.put("ui", applicationProperties.getUi());
+        settings.put(
+                "system",
+                Map.of(
+                        "defaultLocale", applicationProperties.getSystem().getDefaultLocale(),
+                        "showUpdate", applicationProperties.getSystem().isShowUpdate(),
+                        "showUpdateOnlyAdmin",
+                                applicationProperties.getSystem().isShowUpdateOnlyAdmin(),
+                        "customHTMLFiles", applicationProperties.getSystem().isCustomHTMLFiles(),
+                        "fileUploadLimit", applicationProperties.getSystem().getFileUploadLimit()));
+        return ResponseEntity.ok(settings);
+    }
+
+    @PostMapping("/admin/settings/general")
+    @Hidden
+    public ResponseEntity<String> updateGeneralSettings(@RequestBody Map<String, Object> settings)
+            throws IOException {
+        // Update UI settings
+        if (settings.containsKey("ui")) {
+            Map<String, String> ui = (Map<String, String>) settings.get("ui");
+            if (ui.containsKey("appNameNavbar")) {
+                GeneralUtils.saveKeyToSettings("ui.appNameNavbar", ui.get("appNameNavbar"));
+                applicationProperties.getUi().setAppNameNavbar(ui.get("appNameNavbar"));
+            }
+        }
+
+        // Update System settings
+        if (settings.containsKey("system")) {
+            Map<String, Object> system = (Map<String, Object>) settings.get("system");
+            if (system.containsKey("defaultLocale")) {
+                GeneralUtils.saveKeyToSettings("system.defaultLocale", system.get("defaultLocale"));
+                applicationProperties
+                        .getSystem()
+                        .setDefaultLocale((String) system.get("defaultLocale"));
+            }
+            if (system.containsKey("showUpdate")) {
+                GeneralUtils.saveKeyToSettings("system.showUpdate", system.get("showUpdate"));
+                applicationProperties.getSystem().setShowUpdate((Boolean) system.get("showUpdate"));
+            }
+            if (system.containsKey("showUpdateOnlyAdmin")) {
+                GeneralUtils.saveKeyToSettings(
+                        "system.showUpdateOnlyAdmin", system.get("showUpdateOnlyAdmin"));
+                applicationProperties
+                        .getSystem()
+                        .setShowUpdateOnlyAdmin((Boolean) system.get("showUpdateOnlyAdmin"));
+            }
+            if (system.containsKey("fileUploadLimit")) {
+                GeneralUtils.saveKeyToSettings(
+                        "system.fileUploadLimit", system.get("fileUploadLimit"));
+                applicationProperties
+                        .getSystem()
+                        .setFileUploadLimit((String) system.get("fileUploadLimit"));
+            }
+        }
+
+        return ResponseEntity.ok(
+                "General settings updated. Restart required for changes to take effect.");
+    }
+
+    // ========== SECURITY SETTINGS ==========
+
+    @GetMapping("/admin/settings/security")
+    @Hidden
+    public ResponseEntity<Map<String, Object>> getSecuritySettings() {
+        Map<String, Object> settings = new HashMap<>();
+        ApplicationProperties.Security security = applicationProperties.getSecurity();
+
+        settings.put("enableLogin", security.isEnableLogin());
+        settings.put("loginMethod", security.getLoginMethod());
+        settings.put("loginAttemptCount", security.getLoginAttemptCount());
+        settings.put("loginResetTimeMinutes", security.getLoginResetTimeMinutes());
+        settings.put(
+                "initialLogin",
+                Map.of(
+                        "username",
+                        security.getInitialLogin().getUsername() != null
+                                ? security.getInitialLogin().getUsername()
+                                : ""));
+
+        // JWT settings
+        ApplicationProperties.Security.Jwt jwt = security.getJwt();
+        settings.put(
+                "jwt",
+                Map.of(
+                        "enableKeystore", jwt.isEnableKeystore(),
+                        "enableKeyRotation", jwt.isEnableKeyRotation(),
+                        "enableKeyCleanup", jwt.isEnableKeyCleanup(),
+                        "keyRetentionDays", jwt.getKeyRetentionDays()));
+
+        return ResponseEntity.ok(settings);
+    }
+
+    @PostMapping("/admin/settings/security")
+    @Hidden
+    public ResponseEntity<String> updateSecuritySettings(@RequestBody Map<String, Object> settings)
+            throws IOException {
+        if (settings.containsKey("enableLogin")) {
+            GeneralUtils.saveKeyToSettings("security.enableLogin", settings.get("enableLogin"));
+            applicationProperties
+                    .getSecurity()
+                    .setEnableLogin((Boolean) settings.get("enableLogin"));
+        }
+        if (settings.containsKey("loginMethod")) {
+            GeneralUtils.saveKeyToSettings("security.loginMethod", settings.get("loginMethod"));
+            applicationProperties
+                    .getSecurity()
+                    .setLoginMethod((String) settings.get("loginMethod"));
+        }
+        if (settings.containsKey("loginAttemptCount")) {
+            GeneralUtils.saveKeyToSettings(
+                    "security.loginAttemptCount", settings.get("loginAttemptCount"));
+            applicationProperties
+                    .getSecurity()
+                    .setLoginAttemptCount((Integer) settings.get("loginAttemptCount"));
+        }
+        if (settings.containsKey("loginResetTimeMinutes")) {
+            GeneralUtils.saveKeyToSettings(
+                    "security.loginResetTimeMinutes", settings.get("loginResetTimeMinutes"));
+            applicationProperties
+                    .getSecurity()
+                    .setLoginResetTimeMinutes(
+                            ((Number) settings.get("loginResetTimeMinutes")).longValue());
+        }
+
+        // JWT settings
+        if (settings.containsKey("jwt")) {
+            Map<String, Object> jwt = (Map<String, Object>) settings.get("jwt");
+            if (jwt.containsKey("keyRetentionDays")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.jwt.keyRetentionDays", jwt.get("keyRetentionDays"));
+                applicationProperties
+                        .getSecurity()
+                        .getJwt()
+                        .setKeyRetentionDays((Integer) jwt.get("keyRetentionDays"));
+            }
+        }
+
+        return ResponseEntity.ok(
+                "Security settings updated. Restart required for changes to take effect.");
+    }
+
+    // ========== CONNECTIONS SETTINGS (OAuth/SAML) ==========
+
+    @GetMapping("/admin/settings/connections")
+    @Hidden
+    public ResponseEntity<Map<String, Object>> getConnectionsSettings() {
+        Map<String, Object> settings = new HashMap<>();
+        ApplicationProperties.Security security = applicationProperties.getSecurity();
+
+        // OAuth2 settings
+        ApplicationProperties.Security.OAUTH2 oauth2 = security.getOauth2();
+        settings.put(
+                "oauth2",
+                Map.of(
+                        "enabled", oauth2.getEnabled(),
+                        "issuer", oauth2.getIssuer() != null ? oauth2.getIssuer() : "",
+                        "clientId", oauth2.getClientId() != null ? oauth2.getClientId() : "",
+                        "provider", oauth2.getProvider() != null ? oauth2.getProvider() : "",
+                        "autoCreateUser", oauth2.getAutoCreateUser(),
+                        "blockRegistration", oauth2.getBlockRegistration(),
+                        "useAsUsername",
+                                oauth2.getUseAsUsername() != null
+                                        ? oauth2.getUseAsUsername()
+                                        : ""));
+
+        // SAML2 settings
+        ApplicationProperties.Security.SAML2 saml2 = security.getSaml2();
+        settings.put(
+                "saml2",
+                Map.of(
+                        "enabled", saml2.getEnabled(),
+                        "provider", saml2.getProvider() != null ? saml2.getProvider() : "",
+                        "autoCreateUser", saml2.getAutoCreateUser(),
+                        "blockRegistration", saml2.getBlockRegistration(),
+                        "registrationId", saml2.getRegistrationId()));
+
+        return ResponseEntity.ok(settings);
+    }
+
+    @PostMapping("/admin/settings/connections")
+    @Hidden
+    public ResponseEntity<String> updateConnectionsSettings(
+            @RequestBody Map<String, Object> settings) throws IOException {
+        // OAuth2 settings
+        if (settings.containsKey("oauth2")) {
+            Map<String, Object> oauth2 = (Map<String, Object>) settings.get("oauth2");
+            if (oauth2.containsKey("enabled")) {
+                GeneralUtils.saveKeyToSettings("security.oauth2.enabled", oauth2.get("enabled"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setEnabled((Boolean) oauth2.get("enabled"));
+            }
+            if (oauth2.containsKey("issuer")) {
+                GeneralUtils.saveKeyToSettings("security.oauth2.issuer", oauth2.get("issuer"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setIssuer((String) oauth2.get("issuer"));
+            }
+            if (oauth2.containsKey("clientId")) {
+                GeneralUtils.saveKeyToSettings("security.oauth2.clientId", oauth2.get("clientId"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setClientId((String) oauth2.get("clientId"));
+            }
+            if (oauth2.containsKey("clientSecret")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.oauth2.clientSecret", oauth2.get("clientSecret"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setClientSecret((String) oauth2.get("clientSecret"));
+            }
+            if (oauth2.containsKey("provider")) {
+                GeneralUtils.saveKeyToSettings("security.oauth2.provider", oauth2.get("provider"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setProvider((String) oauth2.get("provider"));
+            }
+            if (oauth2.containsKey("autoCreateUser")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.oauth2.autoCreateUser", oauth2.get("autoCreateUser"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setAutoCreateUser((Boolean) oauth2.get("autoCreateUser"));
+            }
+            if (oauth2.containsKey("blockRegistration")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.oauth2.blockRegistration", oauth2.get("blockRegistration"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setBlockRegistration((Boolean) oauth2.get("blockRegistration"));
+            }
+            if (oauth2.containsKey("useAsUsername")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.oauth2.useAsUsername", oauth2.get("useAsUsername"));
+                applicationProperties
+                        .getSecurity()
+                        .getOauth2()
+                        .setUseAsUsername((String) oauth2.get("useAsUsername"));
+            }
+        }
+
+        // SAML2 settings
+        if (settings.containsKey("saml2")) {
+            Map<String, Object> saml2 = (Map<String, Object>) settings.get("saml2");
+            if (saml2.containsKey("enabled")) {
+                GeneralUtils.saveKeyToSettings("security.saml2.enabled", saml2.get("enabled"));
+                applicationProperties
+                        .getSecurity()
+                        .getSaml2()
+                        .setEnabled((Boolean) saml2.get("enabled"));
+            }
+            if (saml2.containsKey("provider")) {
+                GeneralUtils.saveKeyToSettings("security.saml2.provider", saml2.get("provider"));
+                applicationProperties
+                        .getSecurity()
+                        .getSaml2()
+                        .setProvider((String) saml2.get("provider"));
+            }
+            if (saml2.containsKey("autoCreateUser")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.saml2.autoCreateUser", saml2.get("autoCreateUser"));
+                applicationProperties
+                        .getSecurity()
+                        .getSaml2()
+                        .setAutoCreateUser((Boolean) saml2.get("autoCreateUser"));
+            }
+            if (saml2.containsKey("blockRegistration")) {
+                GeneralUtils.saveKeyToSettings(
+                        "security.saml2.blockRegistration", saml2.get("blockRegistration"));
+                applicationProperties
+                        .getSecurity()
+                        .getSaml2()
+                        .setBlockRegistration((Boolean) saml2.get("blockRegistration"));
+            }
+        }
+
+        return ResponseEntity.ok(
+                "Connection settings updated. Restart required for changes to take effect.");
+    }
+
+    // ========== PRIVACY SETTINGS ==========
+
+    @GetMapping("/admin/settings/privacy")
+    @Hidden
+    public ResponseEntity<Map<String, Object>> getPrivacySettings() {
+        Map<String, Object> settings = new HashMap<>();
+
+        settings.put("enableAnalytics", applicationProperties.getSystem().getEnableAnalytics());
+        settings.put("googleVisibility", applicationProperties.getSystem().isGooglevisibility());
+        settings.put("metricsEnabled", applicationProperties.getMetrics().isEnabled());
+
+        return ResponseEntity.ok(settings);
+    }
+
+    @PostMapping("/admin/settings/privacy")
+    @Hidden
+    public ResponseEntity<String> updatePrivacySettings(@RequestBody Map<String, Object> settings)
+            throws IOException {
+        if (settings.containsKey("enableAnalytics")) {
+            GeneralUtils.saveKeyToSettings(
+                    "system.enableAnalytics", settings.get("enableAnalytics"));
+            applicationProperties
+                    .getSystem()
+                    .setEnableAnalytics((Boolean) settings.get("enableAnalytics"));
+        }
+        if (settings.containsKey("googleVisibility")) {
+            GeneralUtils.saveKeyToSettings(
+                    "system.googlevisibility", settings.get("googleVisibility"));
+            applicationProperties
+                    .getSystem()
+                    .setGooglevisibility((Boolean) settings.get("googleVisibility"));
+        }
+        if (settings.containsKey("metricsEnabled")) {
+            GeneralUtils.saveKeyToSettings("metrics.enabled", settings.get("metricsEnabled"));
+            applicationProperties.getMetrics().setEnabled((Boolean) settings.get("metricsEnabled"));
+        }
+
+        return ResponseEntity.ok(
+                "Privacy settings updated. Restart required for changes to take effect.");
+    }
+
+    // ========== ADVANCED SETTINGS ==========
+
+    @GetMapping("/admin/settings/advanced")
+    @Hidden
+    public ResponseEntity<Map<String, Object>> getAdvancedSettings() {
+        Map<String, Object> settings = new HashMap<>();
+
+        settings.put("endpoints", applicationProperties.getEndpoints());
+        settings.put(
+                "enableAlphaFunctionality",
+                applicationProperties.getSystem().isEnableAlphaFunctionality());
+        settings.put("maxDPI", applicationProperties.getSystem().getMaxDPI());
+        settings.put("enableUrlToPDF", applicationProperties.getSystem().isEnableUrlToPDF());
+        settings.put("customPaths", applicationProperties.getSystem().getCustomPaths());
+        settings.put(
+                "tempFileManagement", applicationProperties.getSystem().getTempFileManagement());
+
+        return ResponseEntity.ok(settings);
+    }
+
+    @PostMapping("/admin/settings/advanced")
+    @Hidden
+    public ResponseEntity<String> updateAdvancedSettings(@RequestBody Map<String, Object> settings)
+            throws IOException {
+        if (settings.containsKey("enableAlphaFunctionality")) {
+            GeneralUtils.saveKeyToSettings(
+                    "system.enableAlphaFunctionality", settings.get("enableAlphaFunctionality"));
+            applicationProperties
+                    .getSystem()
+                    .setEnableAlphaFunctionality(
+                            (Boolean) settings.get("enableAlphaFunctionality"));
+        }
+        if (settings.containsKey("maxDPI")) {
+            GeneralUtils.saveKeyToSettings("system.maxDPI", settings.get("maxDPI"));
+            applicationProperties.getSystem().setMaxDPI((Integer) settings.get("maxDPI"));
+        }
+        if (settings.containsKey("enableUrlToPDF")) {
+            GeneralUtils.saveKeyToSettings("system.enableUrlToPDF", settings.get("enableUrlToPDF"));
+            applicationProperties
+                    .getSystem()
+                    .setEnableUrlToPDF((Boolean) settings.get("enableUrlToPDF"));
+        }
+
+        return ResponseEntity.ok(
+                "Advanced settings updated. Restart required for changes to take effect.");
+    }
 }

app/core/src/main/java/stirling/software/SPDF/controller/api/UIDataController.java

@@ -191,7 +191,7 @@ public class UIDataController {
     }
 
     private List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = runtimePathConfig.getTessDataPath();
+        String tessdataDir = applicationProperties.getSystem().getTessdataDir();
         java.io.File[] files = new java.io.File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEbookToPDFController.java

@@ -15,18 +15,20 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.converters.ConvertEbookToPdfRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
@@ -34,7 +36,9 @@ import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class ConvertEbookToPDFController {
@@ -54,7 +58,7 @@ public class ConvertEbookToPDFController {
         return endpointConfiguration.isGroupEnabled("Ghostscript");
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/ebook/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/ebook/pdf")
     @Operation(
             summary = "Convert an eBook file to PDF",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java

@@ -10,7 +10,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.HtmlUtils;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
@@ -42,12 +41,12 @@ public class ConvertEmlToPDF {
     @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/eml/pdf")
     @StandardPdfResponse
     @Operation(
-            summary = "Convert EML/MSG to PDF",
+            summary = "Convert EML to PDF",
             description =
-                    "This endpoint converts EML (email) and MSG (Outlook) files to PDF format"
-                            + " with extensive customization options. Features include font settings,"
-                            + " image constraints, display modes, attachment handling, and HTML debug"
-                            + " output. Input: EML or MSG file, Output: PDF or HTML file. Type: SISO")
+                    "This endpoint converts EML (email) files to PDF format with extensive"
+                            + " customization options. Features include font settings, image"
+                            + " constraints, display modes, attachment handling, and HTML debug output."
+                            + " Input: EML file, Output: PDF or HTML file. Type: SISO")
     public ResponseEntity<byte[]> convertEmlToPdf(@ModelAttribute EmlToPdfRequest request) {
 
         MultipartFile inputFile = request.getFileInput();
@@ -55,7 +54,7 @@ public class ConvertEmlToPDF {
 
         // Validate input
         if (inputFile.isEmpty()) {
-            log.error("No file provided for EML/MSG to PDF conversion.");
+            log.error("No file provided for EML to PDF conversion.");
             return ResponseEntity.badRequest()
                     .body("No file provided".getBytes(StandardCharsets.UTF_8));
         }
@@ -66,12 +65,12 @@ public class ConvertEmlToPDF {
                     .body("Please provide a valid filename".getBytes(StandardCharsets.UTF_8));
         }
 
-        // Validate file type - support EML and MSG (Outlook) files
+        // Validate file type - support EML
         String lowerFilename = originalFilename.toLowerCase(Locale.ROOT);
-        if (!lowerFilename.endsWith(".eml") && !lowerFilename.endsWith(".msg")) {
-            log.error("Invalid file type for EML/MSG to PDF: {}", originalFilename);
+        if (!lowerFilename.endsWith(".eml")) {
+            log.error("Invalid file type for EML to PDF: {}", originalFilename);
             return ResponseEntity.badRequest()
-                    .body("Please upload a valid EML or MSG file".getBytes(StandardCharsets.UTF_8));
+                    .body("Please upload a valid EML file".getBytes(StandardCharsets.UTF_8));
         }
 
         String baseFilename = Filenames.toSimpleFileName(originalFilename); // Use Filenames utility
@@ -82,7 +81,7 @@ public class ConvertEmlToPDF {
             if (request.isDownloadHtml()) {
                 try {
                     String htmlContent = EmlToPdf.convertEmlToHtml(fileBytes, request);
-                    log.info("Successfully converted email to HTML: {}", originalFilename);
+                    log.info("Successfully converted EML to HTML: {}", originalFilename);
                     return WebResponseUtils.bytesToWebResponse(
                             htmlContent.getBytes(StandardCharsets.UTF_8),
                             baseFilename + ".html",
@@ -96,11 +95,12 @@ public class ConvertEmlToPDF {
                 }
             }
 
-            // Convert EML/MSG to PDF with enhanced options
+            // Convert EML to PDF with enhanced options
             try {
                 byte[] pdfBytes =
                         EmlToPdf.convertEmlToPdf(
-                                runtimePathConfig.getWeasyPrintPath(),
+                                runtimePathConfig
+                                        .getWeasyPrintPath(), // Use configured WeasyPrint path
                                 request,
                                 fileBytes,
                                 originalFilename,
@@ -115,19 +115,19 @@ public class ConvertEmlToPDF {
                                     "PDF conversion failed - empty output"
                                             .getBytes(StandardCharsets.UTF_8));
                 }
-                log.info("Successfully converted email to PDF: {}", originalFilename);
+                log.info("Successfully converted EML to PDF: {}", originalFilename);
                 return WebResponseUtils.bytesToWebResponse(
                         pdfBytes, baseFilename + ".pdf", MediaType.APPLICATION_PDF);
 
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
-                log.error("Email to PDF conversion was interrupted for {}", originalFilename, e);
+                log.error("EML to PDF conversion was interrupted for {}", originalFilename, e);
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                         .body("Conversion was interrupted".getBytes(StandardCharsets.UTF_8));
             } catch (IllegalArgumentException e) {
                 String errorMessage = buildErrorMessage(e, originalFilename);
                 log.error(
-                        "Email to PDF conversion failed for {}: {}",
+                        "EML to PDF conversion failed for {}: {}",
                         originalFilename,
                         errorMessage,
                         e);
@@ -136,7 +136,7 @@ public class ConvertEmlToPDF {
             } catch (RuntimeException e) {
                 String errorMessage = buildErrorMessage(e, originalFilename);
                 log.error(
-                        "Email to PDF conversion failed for {}: {}",
+                        "EML to PDF conversion failed for {}: {}",
                         originalFilename,
                         errorMessage,
                         e);
@@ -145,31 +145,27 @@ public class ConvertEmlToPDF {
             }
 
         } catch (IOException e) {
-            log.error("File processing error for email to PDF: {}", originalFilename, e);
+            log.error("File processing error for EML to PDF: {}", originalFilename, e);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                     .body("File processing error".getBytes(StandardCharsets.UTF_8));
         }
     }
 
     private static @NotNull String buildErrorMessage(Exception e, String originalFilename) {
-        String safeFilename = HtmlUtils.htmlEscape(originalFilename);
-        String exceptionMessage = e.getMessage();
-        String safeExceptionMessage =
-                exceptionMessage == null ? "Unknown error" : HtmlUtils.htmlEscape(exceptionMessage);
         String errorMessage;
-        if (exceptionMessage != null && exceptionMessage.contains("Invalid EML")) {
+        if (e.getMessage() != null && e.getMessage().contains("Invalid EML")) {
             errorMessage =
                     "Invalid EML file format. Please ensure you've uploaded a valid email"
                             + " file ("
-                            + safeFilename
+                            + originalFilename
                             + ").";
-        } else if (exceptionMessage != null && exceptionMessage.contains("WeasyPrint")) {
+        } else if (e.getMessage() != null && e.getMessage().contains("WeasyPrint")) {
             errorMessage =
                     "PDF generation failed for "
-                            + safeFilename
+                            + originalFilename
                             + ". This may be due to complex email formatting.";
         } else {
-            errorMessage = "Conversion failed for " + safeFilename + ": " + safeExceptionMessage;
+            errorMessage = "Conversion failed for " + originalFilename + ": " + e.getMessage();
         }
         return errorMessage;
     }

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java

@@ -97,6 +97,8 @@ public class ConvertOfficeController {
                 // Unoconvert: schreibe direkt in outputPath innerhalb des workDir
                 List<String> command = new ArrayList<>();
                 command.add(runtimePathConfig.getUnoConvertPath());
+                command.add("--port");
+                command.add("2003");
                 command.add("--convert-to");
                 command.add("pdf");
                 command.add(inputPath.toString());

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToEpubController.java

@@ -12,10 +12,14 @@ import org.apache.commons.io.FilenameUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,15 +28,15 @@ import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.converters.ConvertPdfToEpubRequest;
 import stirling.software.SPDF.model.api.converters.ConvertPdfToEpubRequest.OutputFormat;
 import stirling.software.SPDF.model.api.converters.ConvertPdfToEpubRequest.TargetDevice;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class ConvertPDFToEpubController {
@@ -73,7 +77,7 @@ public class ConvertPDFToEpubController {
         return command;
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/epub")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/epub")
     @Operation(
             summary = "Convert PDF to EPUB/AZW3",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java

@@ -3,27 +3,31 @@ package stirling.software.SPDF.controller.api.converters;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.PDFToFile;
 import stirling.software.common.util.TempFileManager;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertPDFToHtml {
 
     private final TempFileManager tempFileManager;
     private final RuntimePathConfig runtimePathConfig;
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/html")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/html")
     @Operation(
             summary = "Convert PDF to HTML",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java

@@ -7,17 +7,19 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.converters.PdfToPresentationRequest;
 import stirling.software.SPDF.model.api.converters.PdfToTextOrRTFRequest;
 import stirling.software.SPDF.model.api.converters.PdfToWordRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -26,7 +28,9 @@ import stirling.software.common.util.PDFToFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class ConvertPDFToOffice {
 
@@ -34,7 +38,7 @@ public class ConvertPDFToOffice {
     private final TempFileManager tempFileManager;
     private final RuntimePathConfig runtimePathConfig;
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/presentation")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/presentation")
     @Operation(
             summary = "Convert PDF to Presentation format",
             description =
@@ -49,7 +53,7 @@ public class ConvertPDFToOffice {
         return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "impress_pdf_import");
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/text")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/text")
     @Operation(
             summary = "Convert PDF to Text or RTF format",
             description =
@@ -75,7 +79,7 @@ public class ConvertPDFToOffice {
         }
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/word")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/word")
     @Operation(
             summary = "Convert PDF to Word document",
             description =
@@ -89,7 +93,7 @@ public class ConvertPDFToOffice {
         return pdfToFile.processPdfToOfficeFormat(inputFile, outputFormat, "writer_pdf_import");
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/xml")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/xml")
     @Operation(
             summary = "Convert PDF to XML",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -74,26 +74,30 @@ import org.apache.xmpbox.xml.XmpSerializer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
 @Slf4j
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class ConvertPDFToPDFA {
 
@@ -479,22 +483,15 @@ public class ConvertPDFToPDFA {
         command.add("-dCompatibilityLevel=" + profile.getCompatibilityLevel());
         command.add("-sDEVICE=pdfwrite");
         command.add("-sColorConversionStrategy=RGB");
+        command.add("-dProcessColorModel=/DeviceRGB");
         command.add("-sOutputICCProfile=" + colorProfiles.rgb().toAbsolutePath());
         command.add("-sDefaultRGBProfile=" + colorProfiles.rgb().toAbsolutePath());
         command.add("-sDefaultGrayProfile=" + colorProfiles.gray().toAbsolutePath());
         command.add("-dEmbedAllFonts=true");
-        command.add("-dSubsetFonts=true");
+        command.add("-dSubsetFonts=false"); // Embed complete fonts to avoid incomplete glyphs
         command.add("-dCompressFonts=true");
         command.add("-dNOSUBSTFONTS=false"); // Allow font substitution for problematic fonts
-
-        // Explicitly tune downsampling/compression for high-quality print
-        command.add("-dColorImageDownsampleType=/Bicubic");
-        command.add("-dColorImageResolution=300");
-        command.add("-dGrayImageDownsampleType=/Bicubic");
-        command.add("-dGrayImageResolution=300");
-        command.add("-dMonoImageDownsampleType=/Bicubic");
-        command.add("-dMonoImageResolution=1200");
-
+        command.add("-dPDFSETTINGS=/prepress");
         command.add("-dNOPAUSE");
         command.add("-dBATCH");
         command.add("-dNOOUTERSAVE");
@@ -565,7 +562,7 @@ public class ConvertPDFToPDFA {
         }
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/pdfa")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/pdfa")
     @Operation(
             summary = "Convert a PDF to a PDF/A or PDF/X",
             description =
@@ -2452,7 +2449,9 @@ public class ConvertPDFToPDFA {
 
     @Getter
     private enum PdfXProfile {
-        PDF_X("PDF/X", "_PDFX.pdf", "1.6", "2008", "pdfx");
+        PDF_X_1("PDF/X-1", "_PDFX-1.pdf", "1.3", "2001", "pdfx-1", "pdfx"),
+        PDF_X_3("PDF/X-3", "_PDFX-3.pdf", "1.3", "2003", "pdfx-3"),
+        PDF_X_4("PDF/X-4", "_PDFX-4.pdf", "1.4", "2008", "pdfx-4");
 
         private final String displayName;
         private final String suffix;
@@ -2478,7 +2477,7 @@ public class ConvertPDFToPDFA {
 
         static PdfXProfile fromRequest(String requestToken) {
             if (requestToken == null) {
-                return PDF_X;
+                return PDF_X_4;
             }
             String normalized = requestToken.trim().toLowerCase(Locale.ROOT);
             Optional<PdfXProfile> match =
@@ -2486,7 +2485,7 @@ public class ConvertPDFToPDFA {
                             .filter(profile -> profile.requestTokens.contains(normalized))
                             .findFirst();
 
-            return match.orElse(PDF_X);
+            return match.orElse(PDF_X_4);
         }
 
         String outputSuffix() {

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java

@@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
@@ -88,7 +89,7 @@ public class ConvertPdfJsonController {
         return WebResponseUtils.bytesToWebResponse(pdfBytes, docName);
     }
 
-    @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/text-editor/metadata")
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf/text-editor/metadata")
     @Operation(
             summary = "Extract PDF metadata for text editor lazy loading",
             description =
@@ -126,7 +127,7 @@ public class ConvertPdfJsonController {
                 .body(jsonBytes);
     }
 
-    @AutoJobPostMapping(
+    @PostMapping(
             value = "/pdf/text-editor/partial/{jobId}",
             consumes = MediaType.APPLICATION_JSON_VALUE)
     @StandardPdfResponse
@@ -179,7 +180,7 @@ public class ConvertPdfJsonController {
         return WebResponseUtils.bytesToWebResponse(jsonBytes, docName, MediaType.APPLICATION_JSON);
     }
 
-    @AutoJobPostMapping(value = "/pdf/text-editor/clear-cache/{jobId}")
+    @PostMapping(value = "/pdf/text-editor/clear-cache/{jobId}")
     @Operation(
             summary = "Clear cached PDF document for text editor",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfToVideoController.java

@@ -27,16 +27,18 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.converters.PdfToVideoRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ApplicationContextProvider;
@@ -49,7 +51,9 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class ConvertPdfToVideoController {
 
@@ -64,7 +68,7 @@ public class ConvertPdfToVideoController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final TempFileManager tempFileManager;
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/video")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/video")
     @Operation(
             summary = "Convert PDF to Video Slideshow",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertSvgToPDF.java

@@ -1,244 +0,0 @@
-package stirling.software.SPDF.controller.api.converters;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
-import stirling.software.SPDF.model.api.converters.SvgToPdfRequest;
-import stirling.software.SPDF.utils.SvgToPdf;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
-import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.GeneralUtils;
-import stirling.software.common.util.SvgSanitizer;
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
-import stirling.software.common.util.WebResponseUtils;
-
-@ConvertApi
-@Slf4j
-@RequiredArgsConstructor
-public class ConvertSvgToPDF {
-
-    private final CustomPDFDocumentFactory pdfDocumentFactory;
-    private final SvgSanitizer svgSanitizer;
-    private final TempFileManager tempFileManager;
-
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/svg/pdf")
-    @MultiFileResponse
-    @Operation(
-            summary = "Convert SVG to PDF",
-            description =
-                    "This endpoint converts one or more SVG (Scalable Vector Graphics) files to PDF format. "
-                            + "Each SVG is converted to a separate PDF file. "
-                            + "The conversion preserves vector graphics for crisp output at any resolution - no rasterization occurs. "
-                            + "SVG dimensions (width/height) determine the PDF page size; defaults to A4 if not specified. "
-                            + "SVG content is sanitized to prevent XSS attacks. "
-                            + "Input: SVG file(s), Output: PDF file(s) or ZIP. Type: MIMO")
-    public ResponseEntity<byte[]> convertSvgToPdf(@ModelAttribute SvgToPdfRequest request) {
-
-        MultipartFile[] inputFiles = request.getFileInput();
-        boolean combineIntoSinglePdf = Boolean.TRUE.equals(request.getCombineIntoSinglePdf());
-
-        // Validate input
-        if (inputFiles == null || inputFiles.length == 0) {
-            log.error("No files provided for SVG to PDF conversion.");
-            return ResponseEntity.badRequest()
-                    .body("No files provided".getBytes(StandardCharsets.UTF_8));
-        }
-
-        try {
-            List<byte[]> sanitizedSvgs = new ArrayList<>();
-            List<String> filenames = new ArrayList<>();
-
-            for (MultipartFile inputFile : inputFiles) {
-                if (inputFile == null || inputFile.isEmpty()) {
-                    log.warn("Skipping empty file in batch conversion");
-                    continue;
-                }
-
-                String originalFilename = inputFile.getOriginalFilename();
-                if (originalFilename == null || originalFilename.trim().isEmpty()) {
-                    log.warn("Skipping file with null or empty filename");
-                    continue;
-                }
-
-                String lowerFilename = originalFilename.toLowerCase(Locale.ROOT);
-                if (!lowerFilename.endsWith(".svg")) {
-                    log.warn("Skipping non-SVG file: {}", originalFilename);
-                    continue;
-                }
-
-                try {
-                    byte[] fileBytes = inputFile.getBytes();
-                    byte[] sanitizedBytes = svgSanitizer.sanitize(fileBytes);
-                    sanitizedSvgs.add(sanitizedBytes);
-                    filenames.add(Filenames.toSimpleFileName(originalFilename));
-
-                } catch (IOException e) {
-                    log.error(
-                            "SVG sanitization/reading failed for {}: {}",
-                            originalFilename,
-                            e.getMessage());
-                }
-            }
-
-            if (sanitizedSvgs.isEmpty()) {
-                log.error("No valid SVG files were found");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
-                        .body("No valid SVG files were found".getBytes(StandardCharsets.UTF_8));
-            }
-
-            if (combineIntoSinglePdf) {
-                return handleCombinedConversion(sanitizedSvgs, filenames);
-            } else {
-                return handleSeparateConversion(sanitizedSvgs, filenames);
-            }
-
-        } catch (Exception e) {
-            log.error("Unexpected error during SVG to PDF conversion", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(
-                            "An unexpected error occurred during conversion"
-                                    .getBytes(StandardCharsets.UTF_8));
-        }
-    }
-
-    private ResponseEntity<byte[]> handleCombinedConversion(
-            List<byte[]> sanitizedSvgs, List<String> filenames) {
-        try {
-            log.info("Combining {} SVG files into single PDF", sanitizedSvgs.size());
-
-            byte[] pdfBytes = SvgToPdf.combineIntoPdf(sanitizedSvgs);
-
-            if (pdfBytes == null || pdfBytes.length == 0) {
-                log.error("PDF conversion failed - empty output");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                        .body(
-                                "PDF conversion failed - empty output"
-                                        .getBytes(StandardCharsets.UTF_8));
-            }
-
-            pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
-
-            String outputFilename =
-                    filenames.isEmpty()
-                            ? "combined_svgs.pdf"
-                            : GeneralUtils.generateFilename(filenames.get(0), "_combined.pdf");
-
-            log.info("Successfully combined {} SVGs into single PDF", sanitizedSvgs.size());
-
-            return WebResponseUtils.bytesToWebResponse(
-                    pdfBytes, outputFilename, MediaType.APPLICATION_PDF);
-
-        } catch (IOException e) {
-            log.error("Error combining SVGs into PDF", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(
-                            ("Conversion failed: " + e.getMessage())
-                                    .getBytes(StandardCharsets.UTF_8));
-        }
-    }
-
-    private ResponseEntity<byte[]> handleSeparateConversion(
-            List<byte[]> sanitizedSvgs, List<String> filenames) {
-        List<ConvertedPdf> convertedPdfs = new ArrayList<>();
-
-        for (int i = 0; i < sanitizedSvgs.size(); i++) {
-            byte[] sanitizedBytes = sanitizedSvgs.get(i);
-            String baseFilename = filenames.get(i);
-
-            try {
-                byte[] pdfBytes = SvgToPdf.convert(sanitizedBytes);
-
-                if (pdfBytes == null || pdfBytes.length == 0) {
-                    log.error("PDF conversion failed - empty output for {}", baseFilename);
-                    continue;
-                }
-
-                pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);
-
-                String outputFilename = GeneralUtils.generateFilename(baseFilename, ".pdf");
-                convertedPdfs.add(new ConvertedPdf(outputFilename, pdfBytes));
-
-                log.info("Successfully converted SVG to PDF: {}", baseFilename);
-
-            } catch (IOException e) {
-                log.error("File processing error for SVG to PDF: {}", baseFilename, e);
-            }
-        }
-
-        if (convertedPdfs.isEmpty()) {
-            log.error("No files were successfully converted");
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("No files were successfully converted".getBytes(StandardCharsets.UTF_8));
-        }
-
-        try {
-            if (convertedPdfs.size() == 1) {
-                ConvertedPdf pdf = convertedPdfs.get(0);
-                return WebResponseUtils.bytesToWebResponse(
-                        pdf.content, pdf.filename, MediaType.APPLICATION_PDF);
-            }
-
-            String zipFilename =
-                    filenames.isEmpty()
-                            ? "converted_svgs.zip"
-                            : GeneralUtils.generateFilename(
-                                    filenames.get(0), "_converted_svgs.zip");
-            byte[] zipBytes = createZipFromPdfs(convertedPdfs);
-
-            return WebResponseUtils.bytesToWebResponse(
-                    zipBytes, zipFilename, MediaType.APPLICATION_OCTET_STREAM);
-        } catch (IOException e) {
-            log.error("Failed to create response", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body("Failed to create response".getBytes(StandardCharsets.UTF_8));
-        }
-    }
-
-    private byte[] createZipFromPdfs(List<ConvertedPdf> pdfs) throws IOException {
-        try (TempFile tempZipFile = new TempFile(tempFileManager, ".zip");
-                ZipOutputStream zipOut =
-                        new ZipOutputStream(Files.newOutputStream(tempZipFile.getPath()))) {
-
-            for (ConvertedPdf pdf : pdfs) {
-                ZipEntry pdfEntry = new ZipEntry(pdf.filename);
-                zipOut.putNextEntry(pdfEntry);
-                zipOut.write(pdf.content);
-                zipOut.closeEntry();
-                log.debug("Added {} to ZIP", pdf.filename);
-            }
-
-            return Files.readAllBytes(tempZipFile.getPath());
-        }
-    }
-
-    private static class ConvertedPdf {
-        final String filename;
-        final byte[] content;
-
-        ConvertedPdf(String filename, byte[] content) {
-            this.filename = filename;
-            this.content = content;
-        }
-    }
-}

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -21,17 +21,19 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -41,8 +43,10 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.RegexPatternUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
 @Slf4j
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertWebsiteToPDF {
 
@@ -55,7 +59,7 @@ public class ConvertWebsiteToPDF {
 
     private static final Pattern NUMERIC_HTML_ENTITY_PATTERN = Pattern.compile("&#(x?[0-9a-f]+);");
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/url/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/url/pdf")
     @Operation(
             summary = "Convert a URL to a PDF",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/PdfVectorExportController.java

@@ -13,8 +13,12 @@ import org.apache.commons.io.FilenameUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.validation.Valid;
 
@@ -23,8 +27,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.converters.PdfVectorExportRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
@@ -33,8 +35,10 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
 @Slf4j
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class PdfVectorExportController {
 
@@ -45,7 +49,7 @@ public class PdfVectorExportController {
     private final TempFileManager tempFileManager;
     private final EndpointConfiguration endpointConfiguration;
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/vector/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/vector/pdf")
     @Operation(
             summary = "Convert PostScript formats to PDF",
             description =
@@ -90,7 +94,7 @@ public class PdfVectorExportController {
         }
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/vector")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/vector")
     @Operation(
             summary = "Convert PDF to vector format",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java

@@ -8,6 +8,9 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
@@ -15,6 +18,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
@@ -24,22 +28,20 @@ import stirling.software.SPDF.model.api.filter.ContainsTextRequest;
 import stirling.software.SPDF.model.api.filter.FileSizeRequest;
 import stirling.software.SPDF.model.api.filter.PageRotationRequest;
 import stirling.software.SPDF.model.api.filter.PageSizeRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.FilterApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@FilterApi
+@RestController
+@RequestMapping("/api/v1/filter")
+@Tag(name = "Filter", description = "Filter APIs")
 @RequiredArgsConstructor
 public class FilterController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
-    @AutoJobPostMapping(
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
-            value = "/filter-contains-text")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-contains-text")
     @Operation(
             summary = "Checks if a PDF contains set text, returns true if does",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -68,9 +70,7 @@ public class FilterController {
         return ResponseEntity.noContent().build();
     }
 
-    @AutoJobPostMapping(
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
-            value = "/filter-contains-image")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-contains-image")
     @Operation(
             summary = "Checks if a PDF contains an image",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -98,9 +98,7 @@ public class FilterController {
         return ResponseEntity.noContent().build();
     }
 
-    @AutoJobPostMapping(
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
-            value = "/filter-page-count")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-page-count")
     @Operation(
             summary = "Checks if a PDF is greater, less or equal to a setPageCount",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -131,7 +129,7 @@ public class FilterController {
                 : ResponseEntity.noContent().build();
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-page-size")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-page-size")
     @Operation(
             summary = "Checks if a PDF is of a certain size",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -168,7 +166,7 @@ public class FilterController {
                 : ResponseEntity.noContent().build();
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-file-size")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-file-size")
     @Operation(
             summary = "Checks if a PDF is a set file size",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -196,9 +194,7 @@ public class FilterController {
                 : ResponseEntity.noContent().build();
     }
 
-    @AutoJobPostMapping(
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
-            value = "/filter-page-rotation")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/filter-page-rotation")
     @Operation(
             summary = "Checks if a PDF is of a certain rotation",
             description = "Input:PDF Output:Boolean Type:SISO")

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -36,18 +36,20 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.service.LineArtConversionService;
 import stirling.software.common.util.ExceptionUtils;
@@ -58,8 +60,10 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class CompressController {
 
@@ -918,7 +922,7 @@ public class CompressController {
         return Math.min(9, currentLevel + 1);
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/compress-pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/compress-pdf")
     @Operation(
             summary = "Optimize PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java

@@ -75,25 +75,10 @@ public class ConfigController {
             String frontendUrl = applicationProperties.getSystem().getFrontendUrl();
             configData.put("frontendUrl", frontendUrl != null ? frontendUrl : "");
 
-            // Add mobile scanner settings
+            // Add mobile scanner setting
             configData.put(
                     "enableMobileScanner",
                     applicationProperties.getSystem().isEnableMobileScanner());
-            configData.put(
-                    "mobileScannerConvertToPdf",
-                    applicationProperties.getSystem().getMobileScannerSettings().isConvertToPdf());
-            configData.put(
-                    "mobileScannerImageResolution",
-                    applicationProperties
-                            .getSystem()
-                            .getMobileScannerSettings()
-                            .getImageResolution());
-            configData.put(
-                    "mobileScannerPageFormat",
-                    applicationProperties.getSystem().getMobileScannerSettings().getPageFormat());
-            configData.put(
-                    "mobileScannerStretchToFit",
-                    applicationProperties.getSystem().getMobileScannerSettings().isStretchToFit());
 
             // Extract values from ApplicationProperties
             configData.put("appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
@@ -112,16 +97,6 @@ public class ConfigController {
                     "showSettingsWhenNoLogin",
                     applicationProperties.getSystem().isShowSettingsWhenNoLogin());
 
-            // SSO Provider settings
-            boolean enableOAuth =
-                    applicationProperties.getSecurity().getOauth2() != null
-                            && applicationProperties.getSecurity().getOauth2().getEnabled();
-            boolean enableSaml =
-                    applicationProperties.getSecurity().getSaml2() != null
-                            && applicationProperties.getSecurity().getSaml2().getEnabled();
-            configData.put("enableOAuth", enableOAuth);
-            configData.put("enableSaml", enableSaml);
-
             // Mail settings - check both SMTP enabled AND invites enabled
             boolean smtpEnabled = applicationProperties.getMail().isEnabled();
             boolean invitesEnabled = applicationProperties.getMail().isEnableInvites();

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/MobileScannerController.java

@@ -31,7 +31,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.MobileScannerService;
 import stirling.software.common.service.MobileScannerService.FileMetadata;
 
@@ -52,31 +51,9 @@ import stirling.software.common.service.MobileScannerService.FileMetadata;
 public class MobileScannerController {
 
     private final MobileScannerService mobileScannerService;
-    private final ApplicationProperties applicationProperties;
 
-    public MobileScannerController(
-            MobileScannerService mobileScannerService,
-            ApplicationProperties applicationProperties) {
+    public MobileScannerController(MobileScannerService mobileScannerService) {
         this.mobileScannerService = mobileScannerService;
-        this.applicationProperties = applicationProperties;
-    }
-
-    /**
-     * Check if mobile scanner feature is enabled
-     *
-     * @return Error response if disabled, null if enabled
-     */
-    private ResponseEntity<Map<String, Object>> checkFeatureEnabled() {
-        if (!applicationProperties.getSystem().isEnableMobileScanner()) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN)
-                    .body(
-                            Map.of(
-                                    "error",
-                                    "Mobile scanner feature is not enabled",
-                                    "enabled",
-                                    false));
-        }
-        return null;
     }
 
     /**
@@ -94,16 +71,10 @@ public class MobileScannerController {
             description = "Session created successfully",
             content = @Content(schema = @Schema(implementation = SessionInfoResponse.class)))
     @ApiResponse(responseCode = "400", description = "Invalid session ID")
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     public ResponseEntity<Map<String, Object>> createSession(
             @Parameter(description = "Session ID for QR code", required = true) @PathVariable
                     String sessionId) {
 
-        ResponseEntity<Map<String, Object>> featureCheck = checkFeatureEnabled();
-        if (featureCheck != null) {
-            return featureCheck;
-        }
-
         try {
             MobileScannerService.SessionInfo sessionInfo =
                     mobileScannerService.createSession(sessionId);
@@ -138,16 +109,10 @@ public class MobileScannerController {
             description = "Session is valid",
             content = @Content(schema = @Schema(implementation = SessionInfoResponse.class)))
     @ApiResponse(responseCode = "404", description = "Session not found or expired")
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     public ResponseEntity<Map<String, Object>> validateSession(
             @Parameter(description = "Session ID to validate", required = true) @PathVariable
                     String sessionId) {
 
-        ResponseEntity<Map<String, Object>> featureCheck = checkFeatureEnabled();
-        if (featureCheck != null) {
-            return featureCheck;
-        }
-
         MobileScannerService.SessionInfo sessionInfo =
                 mobileScannerService.validateSession(sessionId);
 
@@ -182,7 +147,6 @@ public class MobileScannerController {
             description = "Files uploaded successfully",
             content = @Content(schema = @Schema(implementation = UploadResponse.class)))
     @ApiResponse(responseCode = "400", description = "Invalid session ID or files")
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     @ApiResponse(responseCode = "500", description = "Upload failed")
     public ResponseEntity<Map<String, Object>> uploadFiles(
             @Parameter(description = "Session ID from QR code", required = true) @PathVariable
@@ -190,11 +154,6 @@ public class MobileScannerController {
             @Parameter(description = "Files to upload", required = true) @RequestParam("files")
                     List<MultipartFile> files) {
 
-        ResponseEntity<Map<String, Object>> featureCheck = checkFeatureEnabled();
-        if (featureCheck != null) {
-            return featureCheck;
-        }
-
         try {
             if (files == null || files.isEmpty()) {
                 return ResponseEntity.badRequest().body(Map.of("error", "No files provided"));
@@ -235,16 +194,10 @@ public class MobileScannerController {
             responseCode = "200",
             description = "File list retrieved",
             content = @Content(schema = @Schema(implementation = FileListResponse.class)))
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     public ResponseEntity<Map<String, Object>> getSessionFiles(
             @Parameter(description = "Session ID", required = true) @PathVariable
                     String sessionId) {
 
-        ResponseEntity<Map<String, Object>> featureCheck = checkFeatureEnabled();
-        if (featureCheck != null) {
-            return featureCheck;
-        }
-
         List<FileMetadata> files = mobileScannerService.getSessionFiles(sessionId);
 
         Map<String, Object> response = new HashMap<>();
@@ -268,17 +221,12 @@ public class MobileScannerController {
             description =
                     "Download a file that was uploaded to a session. File is automatically deleted after download.")
     @ApiResponse(responseCode = "200", description = "File downloaded successfully")
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     @ApiResponse(responseCode = "404", description = "File or session not found")
     public ResponseEntity<Resource> downloadFile(
             @Parameter(description = "Session ID", required = true) @PathVariable String sessionId,
             @Parameter(description = "Filename to download", required = true) @PathVariable
                     String filename) {
 
-        if (!applicationProperties.getSystem().isEnableMobileScanner()) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-        }
-
         try {
             Path filePath = mobileScannerService.getFile(sessionId, filename);
 
@@ -320,16 +268,10 @@ public class MobileScannerController {
             summary = "Delete a session",
             description = "Manually delete a session and all its uploaded files")
     @ApiResponse(responseCode = "200", description = "Session deleted successfully")
-    @ApiResponse(responseCode = "403", description = "Mobile scanner feature not enabled")
     public ResponseEntity<Map<String, Object>> deleteSession(
             @Parameter(description = "Session ID to delete", required = true) @PathVariable
                     String sessionId) {
 
-        ResponseEntity<Map<String, Object>> featureCheck = checkFeatureEnabled();
-        if (featureCheck != null) {
-            return featureCheck;
-        }
-
         mobileScannerService.deleteSession(sessionId);
 
         return ResponseEntity.ok(

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -24,18 +24,20 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -48,7 +50,9 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class OCRController {
@@ -81,7 +85,7 @@ public class OCRController {
                 .toList();
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/ocr-pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/ocr-pdf")
     @Operation(
             summary = "Process a PDF file with OCR",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java

@@ -1,12 +1,7 @@
 package stirling.software.SPDF.controller.api.misc;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -19,11 +14,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
-import stirling.software.SPDF.utils.SvgOverlayUtil;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
 @MiscApi
@@ -37,63 +32,25 @@ public class OverlayImageController {
     @Operation(
             summary = "Overlay image onto a PDF file",
             description =
-                    "This endpoint overlays an image onto a PDF file at the specified coordinates. "
-                            + "Supports both raster formats (PNG, JPEG, etc.) and vector format (SVG). "
-                            + "SVG files are rendered as vector graphics for crisp output at any resolution. "
-                            + "The image can be overlaid on every page of the PDF if specified. "
-                            + "Input:PDF/IMAGE/SVG Output:PDF Type:SISO")
+                    "This endpoint overlays an image onto a PDF file at the specified coordinates."
+                            + " The image can be overlaid on every page of the PDF if specified. "
+                            + " Input:PDF/IMAGE Output:PDF Type:SISO")
     public ResponseEntity<byte[]> overlayImage(@ModelAttribute OverlayImageRequest request) {
         MultipartFile pdfFile = request.getFileInput();
         MultipartFile imageFile = request.getImageFile();
         float x = request.getX();
         float y = request.getY();
         boolean everyPage = Boolean.TRUE.equals(request.getEveryPage());
-
         try {
             byte[] pdfBytes = pdfFile.getBytes();
             byte[] imageBytes = imageFile.getBytes();
-
-            boolean isSvg = SvgOverlayUtil.isSvgImage(imageBytes);
-
-            PDDocument document = pdfDocumentFactory.load(pdfBytes);
-
-            int pages = document.getNumberOfPages();
-            for (int i = 0; i < pages; i++) {
-                PDPage page = document.getPage(i);
-
-                if (isSvg) {
-                    SvgOverlayUtil.overlaySvgOnPage(document, page, imageBytes, x, y);
-                } else {
-                    try (PDPageContentStream contentStream =
-                            new PDPageContentStream(
-                                    document,
-                                    page,
-                                    PDPageContentStream.AppendMode.APPEND,
-                                    true,
-                                    true)) {
-                        PDImageXObject image =
-                                PDImageXObject.createFromByteArray(document, imageBytes, "");
-                        contentStream.drawImage(image, x, y);
-                        log.info("Image successfully overlaid onto PDF page {}", i);
-                    }
-                }
-
-                if (!everyPage && i == 0) {
-                    break;
-                }
-            }
-
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            document.save(baos);
-            document.close();
-
-            byte[] result = baos.toByteArray();
-            log.info("PDF with overlaid image successfully created");
+            byte[] result =
+                    PdfUtils.overlayImage(
+                            pdfDocumentFactory, pdfBytes, imageBytes, x, y, everyPage);
 
             return WebResponseUtils.bytesToWebResponse(
                     result,
                     GeneralUtils.generateFilename(pdfFile.getOriginalFilename(), "_overlayed.pdf"));
-
         } catch (IOException e) {
             log.error("Failed to add image to PDF", e);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java

@@ -34,15 +34,17 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.misc.AddStampRequest;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
@@ -51,7 +53,9 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class StampController {
 
@@ -75,7 +79,7 @@ public class StampController {
                 });
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/add-stamp")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/add-stamp")
     @Operation(
             summary = "Add stamp to a PDF file",
             description =
@@ -273,9 +277,7 @@ public class StampController {
 
         // Split the stampText into multiple lines
         String[] lines =
-                RegexPatternUtils.getInstance()
-                        .getEscapedNewlinePattern()
-                        .split(processedStampText);
+                RegexPatternUtils.getInstance().getEscapedNewlinePattern().split(stampText);
 
         // Calculate dynamic line height based on font ascent and descent
         float ascent = font.getFontDescriptor().getAscent();

app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -1,6 +1,9 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystemException;
 import java.nio.file.FileVisitResult;
@@ -21,6 +24,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -160,8 +164,7 @@ public class PipelineDirectoryProcessor {
             postHogService.captureEvent("pipeline_directory_event", properties);
 
             List<File> filesToProcess = prepareFilesForProcessing(files, processingDir);
-            try (PipelineResult result =
-                    runPipelineAgainstFiles(filesToProcess, config, dir, processingDir)) {}
+            runPipelineAgainstFiles(filesToProcess, config, dir, processingDir);
         }
     }
 
@@ -300,14 +303,14 @@ public class PipelineDirectoryProcessor {
         }
     }
 
-    private PipelineResult runPipelineAgainstFiles(
+    private void runPipelineAgainstFiles(
             List<File> filesToProcess, PipelineConfig config, Path dir, Path processingDir)
             throws IOException {
         try {
             List<Resource> inputFiles =
                     processor.generateInputFiles(filesToProcess.toArray(new File[0]));
             if (inputFiles == null || inputFiles.isEmpty()) {
-                return new PipelineResult();
+                return;
             }
             PipelineResult result = processor.runPipelineAgainstFiles(inputFiles, config);
 
@@ -318,11 +321,9 @@ public class PipelineDirectoryProcessor {
                 moveAndRenameFiles(result.getOutputFiles(), config, dir);
                 deleteOriginalFiles(filesToProcess, processingDir);
             }
-            return result;
         } catch (Exception e) {
             log.error("Error during processing", e);
             moveFilesBack(filesToProcess, processingDir);
-            return new PipelineResult();
         }
     }
 
@@ -349,9 +350,8 @@ public class PipelineDirectoryProcessor {
                 log.info("Created directory: {}", outputPath);
             }
             Path outputFile = outputPath.resolve(outputFileName);
-            try (OutputStream os = new FileOutputStream(outputFile.toFile());
-                    InputStream is = resource.getInputStream()) {
-                is.transferTo(os);
+            try (OutputStream os = new FileOutputStream(outputFile.toFile())) {
+                os.write(((ByteArrayResource) resource).getByteArray());
             }
             log.info("File moved and renamed to {}", outputFile);
         }

app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -15,13 +15,12 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RequestCallback;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -39,8 +38,6 @@ import stirling.software.SPDF.model.PipelineResult;
 import stirling.software.SPDF.service.ApiDocService;
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.service.UserServiceInterface;
-import stirling.software.common.util.TempFile;
-import stirling.software.common.util.TempFileManager;
 
 @Service
 @Slf4j
@@ -52,17 +49,13 @@ public class PipelineProcessor {
 
     private final ServletContext servletContext;
 
-    private final TempFileManager tempFileManager;
-
     public PipelineProcessor(
             ApiDocService apiDocService,
             @Autowired(required = false) UserServiceInterface userService,
-            ServletContext servletContext,
-            TempFileManager tempFileManager) {
+            ServletContext servletContext) {
         this.apiDocService = apiDocService;
         this.userService = userService;
         this.servletContext = servletContext;
-        this.tempFileManager = tempFileManager;
     }
 
     public static String removeTrailingNaming(String filename) {
@@ -144,18 +137,14 @@ public class PipelineProcessor {
                                     body.add(entry.getKey(), entry.getValue());
                                 }
                             }
-                            ResponseEntity<Resource> response = sendWebRequest(url, body);
+                            ResponseEntity<byte[]> response = sendWebRequest(url, body);
                             // If the operation is filter and the response body is null or empty,
                             // skip
                             // this
                             // file
-                            if (response.getBody() instanceof TempFileResource tempFileResource) {
-                                result.addTempFile(tempFileResource.getTempFile());
-                            }
-
                             if (operation.startsWith("/api/v1/filter/filter-")
                                     && (response.getBody() == null
-                                            || response.getBody().contentLength() == 0)) {
+                                            || response.getBody().length == 0)) {
                                 filtersApplied = true;
                                 log.info("Skipping file due to filtering {}", operation);
                                 continue;
@@ -165,7 +154,7 @@ public class PipelineProcessor {
                                 hasErrors = true;
                                 continue;
                             }
-                            processOutputFiles(operation, response, newOutputFiles, result);
+                            processOutputFiles(operation, response, newOutputFiles);
                         }
                     }
                     if (!hasInputFileType) {
@@ -226,13 +215,10 @@ public class PipelineProcessor {
                             body.add(entry.getKey(), entry.getValue());
                         }
                     }
-                    ResponseEntity<Resource> response = sendWebRequest(url, body);
-                    if (response.getBody() instanceof TempFileResource tempFileResource) {
-                        result.addTempFile(tempFileResource.getTempFile());
-                    }
+                    ResponseEntity<byte[]> response = sendWebRequest(url, body);
                     // Handle the response
                     if (HttpStatus.OK.equals(response.getStatusCode())) {
-                        processOutputFiles(operation, response, newOutputFiles, result);
+                        processOutputFiles(operation, response, newOutputFiles);
                     } else {
                         // Log error if the response status is not OK
                         logPrintStream.println(
@@ -281,47 +267,22 @@ public class PipelineProcessor {
         return result;
     }
 
-    /* package */ ResponseEntity<Resource> sendWebRequest(
+    /* package */ ResponseEntity<byte[]> sendWebRequest(
             String url, MultiValueMap<String, Object> body) {
         RestTemplate restTemplate = new RestTemplate();
         // Set up headers, including API key
         HttpHeaders headers = new HttpHeaders();
         String apiKey = getApiKeyForUser();
-        if (apiKey != null && !apiKey.isEmpty()) {
-            headers.add("X-API-KEY", apiKey);
-        }
-
-        // Let the message converter set the multipart boundary/content type
+        headers.add("X-API-KEY", apiKey);
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+        // Create HttpEntity with the body and headers
         HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
-
-        RequestCallback requestCallback =
-                restTemplate.httpEntityCallback(entity, Resource.class /* response type hint */);
-        return restTemplate.execute(
-                url,
-                HttpMethod.POST,
-                requestCallback,
-                response -> {
-                    try {
-                        TempFile tempFile = tempFileManager.createManagedTempFile("pipeline");
-                        Files.copy(
-                                response.getBody(),
-                                tempFile.getPath(),
-                                java.nio.file.StandardCopyOption.REPLACE_EXISTING);
-                        TempFileResource resource = new TempFileResource(tempFile);
-                        return ResponseEntity.status(response.getStatusCode())
-                                .headers(response.getHeaders())
-                                .body(resource);
-                    } catch (IOException e) {
-                        throw new UncheckedIOException(e);
-                    }
-                });
+        // Make the request to the REST endpoint
+        return restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
     }
 
     private List<Resource> processOutputFiles(
-            String operation,
-            ResponseEntity<Resource> response,
-            List<Resource> newOutputFiles,
-            PipelineResult result)
+            String operation, ResponseEntity<byte[]> response, List<Resource> newOutputFiles)
             throws IOException {
         // Define filename
         String newFilename;
@@ -337,14 +298,10 @@ public class PipelineProcessor {
         // Check if the response body is a zip file
         if (isZip(response.getBody(), newFilename)) {
             // Unzip the file and add all the files to the new output files
-            newOutputFiles.addAll(unzip(response.getBody(), result));
+            newOutputFiles.addAll(unzip(response.getBody()));
         } else {
-            final Resource tempResource = response.getBody();
-            if (tempResource instanceof TempFileResource) {
-                result.addTempFile(((TempFileResource) tempResource).getTempFile());
-            }
             Resource outputResource =
-                    new FileSystemResource(tempResource.getFile()) {
+                    new ByteArrayResource(response.getBody()) {
 
                         @Override
                         public String getFilename() {
@@ -356,7 +313,7 @@ public class PipelineProcessor {
         return newOutputFiles;
     }
 
-    public String extractFilename(ResponseEntity<Resource> response) {
+    public String extractFilename(ResponseEntity<byte[]> response) {
         // Default filename if not found
         String filename = "default-filename.ext";
         HttpHeaders headers = response.getHeaders();
@@ -391,7 +348,14 @@ public class PipelineProcessor {
             // debug statement
             log.info("Reading file: {}", path);
             if (Files.exists(path)) {
-                Resource fileResource = new FileSystemResource(file);
+                Resource fileResource =
+                        new ByteArrayResource(Files.readAllBytes(path)) {
+
+                            @Override
+                            public String getFilename() {
+                                return file.getName();
+                            }
+                        };
                 outputFiles.add(fileResource);
             } else {
                 log.info("File not found: {}", path);
@@ -408,11 +372,8 @@ public class PipelineProcessor {
         }
         List<Resource> outputFiles = new ArrayList<>();
         for (MultipartFile file : files) {
-            Path tempFile = Files.createTempFile("SPDF-upload-", ".tmp");
-            file.transferTo(tempFile);
-
             Resource fileResource =
-                    new FileSystemResource(tempFile.toFile()) {
+                    new ByteArrayResource(file.getBytes()) {
 
                         @Override
                         public String getFilename() {
@@ -425,8 +386,8 @@ public class PipelineProcessor {
         return outputFiles;
     }
 
-    private boolean isZip(Resource data, String filename) throws IOException {
-        if (data == null || data.contentLength() < 4) {
+    private boolean isZip(byte[] data, String filename) {
+        if (data == null || data.length < 4) {
             return false;
         }
         if (filename != null) {
@@ -437,41 +398,29 @@ public class PipelineProcessor {
             }
         }
         // Check the first four bytes of the data against the standard zip magic number
-        try (InputStream is = data.getInputStream()) {
-            byte[] header = new byte[4];
-            if (is.read(header) < 4) {
-                return false;
-            }
-            return header[0] == 0x50 && header[1] == 0x4B && header[2] == 0x03 && header[3] == 0x04;
-        }
+        return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
     }
 
-    private boolean isZip(Resource data) throws IOException {
+    private boolean isZip(byte[] data) {
         return isZip(data, null);
     }
 
-    private List<Resource> unzip(Resource data, PipelineResult result) throws IOException {
-        log.info("Unzipping data of length: {}", data.contentLength());
+    private List<Resource> unzip(byte[] data) throws IOException {
+        log.info("Unzipping data of length: {}", data.length);
         List<Resource> unzippedFiles = new ArrayList<>();
-        try (InputStream bais = data.getInputStream();
+        try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
                 ZipInputStream zis = ZipSecurity.createHardenedInputStream(bais)) {
             ZipEntry entry;
             while ((entry = zis.getNextEntry()) != null) {
-                if (entry.isDirectory()) {
-                    continue;
-                }
-                TempFile tempFile = tempFileManager.createManagedTempFile("unzip");
-                result.addTempFile(tempFile);
-                try (OutputStream os = Files.newOutputStream(tempFile.getPath())) {
-                    byte[] buffer = new byte[4096];
-                    int count;
-                    while ((count = zis.read(buffer)) != -1) {
-                        os.write(buffer, 0, count);
-                    }
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buffer = new byte[1024];
+                int count;
+                while ((count = zis.read(buffer)) != -1) {
+                    baos.write(buffer, 0, count);
                 }
                 final String filename = entry.getName();
                 Resource fileResource =
-                        new FileSystemResource(tempFile.getFile()) {
+                        new ByteArrayResource(baos.toByteArray()) {
 
                             @Override
                             public String getFilename() {
@@ -479,9 +428,9 @@ public class PipelineProcessor {
                             }
                         };
                 // If the unzipped file is a zip file, unzip it
-                if (isZip(fileResource, filename)) {
+                if (isZip(baos.toByteArray(), filename)) {
                     log.info("File {} is a zip file. Unzipping...", filename);
-                    unzippedFiles.addAll(unzip(fileResource, result));
+                    unzippedFiles.addAll(unzip(baos.toByteArray()));
                 } else {
                     unzippedFiles.add(fileResource);
                 }
@@ -490,17 +439,4 @@ public class PipelineProcessor {
         log.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
         return unzippedFiles;
     }
-
-    private static class TempFileResource extends FileSystemResource {
-        private final TempFile tempFile;
-
-        public TempFileResource(TempFile tempFile) {
-            super(tempFile.getFile());
-            this.tempFile = tempFile;
-        }
-
-        public TempFile getTempFile() {
-            return tempFile;
-        }
-    }
 }

app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -3,15 +3,21 @@ package stirling.software.SPDF.controller.api.security;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.apache.pdfbox.cos.COSInputStream;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSString;
+import org.apache.pdfbox.io.RandomAccessRead;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
 import org.apache.pdfbox.pdmodel.*;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -29,7 +35,8 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
 import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
-import org.apache.pdfbox.pdmodel.interactive.action.*;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
@@ -37,14 +44,23 @@ import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlin
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineNode;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.preflight.PreflightDocument;
+import org.apache.pdfbox.preflight.ValidationResult;
+import org.apache.pdfbox.preflight.exception.SyntaxValidationException;
+import org.apache.pdfbox.preflight.exception.ValidationException;
+import org.apache.pdfbox.preflight.parser.PreflightParser;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.schema.PDFAIdentificationSchema;
 import org.apache.xmpbox.xml.DomXmpParser;
 import org.apache.xmpbox.xml.XmpParsingException;
 import org.apache.xmpbox.xml.XmpSerializer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -52,22 +68,21 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.api.security.PDFVerificationResult;
-import stirling.software.SPDF.service.VeraPDFService;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.RegexPatternUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
 @Slf4j
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class GetInfoOnPDF {
 
@@ -80,7 +95,6 @@ public class GetInfoOnPDF {
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
-    private final VeraPDFService veraPDFService;
 
     private static void addOutlinesToArray(PDOutlineItem outline, ArrayNode arrayNode) {
         if (outline == null) return;
@@ -97,8 +111,214 @@ public class GetInfoOnPDF {
         }
     }
 
+    public static boolean checkForStandard(PDDocument document, String standardKeyword) {
+        if ("PDF/A".equalsIgnoreCase(standardKeyword)) {
+            return getPdfAConformanceLevel(document) != null;
+        }
+
+        return checkStandardInMetadata(document, standardKeyword);
+    }
+
+    public static String getPdfAConformanceLevel(PDDocument document) {
+        if (document == null || document.isEncrypted()) {
+            return null;
+        }
+
+        return getPdfAVersionFromMetadata(document);
+    }
+
+    private static String getPdfAVersionFromMetadata(PDDocument document) {
+        try {
+            PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
+            if (pdMetadata != null) {
+                try (COSInputStream metaStream = pdMetadata.createInputStream()) {
+                    DomXmpParser domXmpParser = new DomXmpParser();
+                    XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
+
+                    PDFAIdentificationSchema pdfId = xmpMeta.getPDFAIdentificationSchema();
+                    if (pdfId != null) {
+                        Integer part = pdfId.getPart();
+                        String conformance = pdfId.getConformance();
+
+                        if (part != null && conformance != null) {
+                            return part + conformance.toUpperCase(Locale.ROOT);
+                        }
+                    } else {
+                        try (COSInputStream rawStream = pdMetadata.createInputStream()) {
+                            byte[] metadataBytes = rawStream.readAllBytes();
+                            String rawMetadata = new String(metadataBytes, StandardCharsets.UTF_8);
+                            String extracted = extractPdfAVersionFromRawXml(rawMetadata);
+                            if (extracted != null) {
+                                return extracted;
+                            }
+                        }
+                    }
+                } catch (XmpParsingException e) {
+                    log.debug("XMP parsing failed, trying raw metadata search: {}", e.getMessage());
+                    try (COSInputStream metaStream = pdMetadata.createInputStream()) {
+                        byte[] metadataBytes = metaStream.readAllBytes();
+                        String rawMetadata = new String(metadataBytes, StandardCharsets.UTF_8);
+                        String extracted = extractPdfAVersionFromRawXml(rawMetadata);
+                        if (extracted != null) {
+                            return extracted;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Error reading PDF/A metadata: {}", e.getMessage());
+        }
+
+        return null;
+    }
+
+    private static String extractPdfAVersionFromRawXml(String rawXml) {
+        if (rawXml == null || rawXml.isEmpty()) {
+            return null;
+        }
+
+        try {
+            Pattern partPattern = RegexPatternUtils.getInstance().getPdfAidPartPattern();
+            Pattern confPattern = RegexPatternUtils.getInstance().getPdfAidConformancePattern();
+
+            Matcher partMatcher = partPattern.matcher(rawXml);
+            Matcher confMatcher = confPattern.matcher(rawXml);
+
+            if (partMatcher.find() && confMatcher.find()) {
+                String part = partMatcher.group(1);
+                String conformance = confMatcher.group(1).toUpperCase(Locale.ROOT);
+                return part + conformance;
+            }
+        } catch (Exception e) {
+            log.debug("Error parsing raw XMP for PDF/A version: {}", e.getMessage());
+        }
+
+        return null;
+    }
+
+    private static boolean validatePdfAWithPreflight(PDDocument document, String version) {
+        if (document == null || document.isEncrypted()) {
+            return false;
+        }
+
+        // Use Stream-to-File pattern: save to temp file instead of loading into memory
+        // This prevents OutOfMemoryError on large PDFs
+        Path tempFile = null;
+        try {
+            tempFile = Files.createTempFile("preflight-", ".pdf");
+
+            // Save document to temp file (avoids loading entire document into memory)
+            try (var outputStream = Files.newOutputStream(tempFile)) {
+                document.save(outputStream);
+            }
+
+            // Use RandomAccessReadBufferedFile for efficient file-based reading
+            // This avoids Windows file locking issues that occur with memory-mapped files
+            try (RandomAccessRead source = new RandomAccessReadBufferedFile(tempFile.toFile())) {
+                PreflightParser parser = new PreflightParser(source);
+
+                try (PDDocument parsedDocument = parser.parse()) {
+                    if (!(parsedDocument instanceof PreflightDocument preflightDocument)) {
+                        log.debug(
+                                "Parsed document is not a PreflightDocument; unable to validate claimed PDF/A {}",
+                                version);
+                        return false;
+                    }
+
+                    try {
+                        ValidationResult result = preflightDocument.validate();
+                        if (!result.isValid() && log.isDebugEnabled()) {
+                            log.debug(
+                                    "PDF/A validation found {} errors for claimed version {}",
+                                    result.getErrorsList().size(),
+                                    version);
+                            int logged = 0;
+                            for (ValidationResult.ValidationError error : result.getErrorsList()) {
+                                log.debug(
+                                        "  Error {}: {}", error.getErrorCode(), error.getDetails());
+                                if (++logged >= MAX_LOGGED_ERRORS) {
+                                    break;
+                                }
+                            }
+                        }
+                        return result.isValid();
+                    } catch (ValidationException e) {
+                        log.debug(
+                                "Validation exception during PDF/A validation: {}", e.getMessage());
+                    }
+                } catch (SyntaxValidationException e) {
+                    log.debug(
+                            "Syntax validation failed during PDF/A validation: {}", e.getMessage());
+                    return false;
+                }
+            }
+        } catch (IOException e) {
+            log.debug("IOException during PDF/A validation: {}", e.getMessage());
+        } catch (Exception e) {
+            log.debug("Unexpected error during PDF/A validation: {}", e.getMessage());
+        } finally {
+            // Explicitly clean up temp file to prevent disk exhaustion
+            // This must be in finally block to ensure cleanup even on exceptions
+            if (tempFile != null) {
+                try {
+                    Files.deleteIfExists(tempFile);
+                } catch (IOException e) {
+                    log.warn(
+                            "Failed to delete temp file during PDF/A validation cleanup: {}",
+                            tempFile,
+                            e);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean checkStandardInMetadata(PDDocument document, String standardKeyword) {
+        // Check XMP Metadata
+        try {
+            PDMetadata pdMetadata = document.getDocumentCatalog().getMetadata();
+            if (pdMetadata != null) {
+                try (COSInputStream metaStream = pdMetadata.createInputStream()) {
+                    // First try to read raw metadata as string to check for standard keywords
+                    byte[] metadataBytes = metaStream.readAllBytes();
+                    String rawMetadata = new String(metadataBytes, StandardCharsets.UTF_8);
+
+                    if (rawMetadata.contains(standardKeyword)) {
+                        return true;
+                    }
+                }
+
+                // If raw check doesn't find it, try parsing with XMP parser
+                try (COSInputStream metaStream = pdMetadata.createInputStream()) {
+                    try {
+                        DomXmpParser domXmpParser = new DomXmpParser();
+                        XMPMetadata xmpMeta = domXmpParser.parse(metaStream);
+
+                        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                        new XmpSerializer().serialize(xmpMeta, baos, true);
+                        String xmpString = baos.toString(StandardCharsets.UTF_8);
+
+                        if (xmpString.contains(standardKeyword)) {
+                            return true;
+                        }
+                    } catch (XmpParsingException e) {
+                        // XMP parsing failed, but we already checked raw metadata above
+                        log.debug(
+                                "XMP parsing failed for standard check, but raw metadata was already checked: {}",
+                                e.getMessage());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            ExceptionUtils.logException("PDF standard checking", e);
+        }
+
+        return false;
+    }
+
     private static ObjectNode generatePDFSummaryData(
-            PDDocument document, List<PDFVerificationResult> verificationResults) {
+            PDDocument document, String pdfaConformanceLevel, Boolean pdfaValidationPassed) {
         ObjectNode summaryData = objectMapper.createObjectNode();
 
         // Check if encrypted
@@ -126,16 +346,24 @@ public class GetInfoOnPDF {
         }
 
         // Check standard compliance
-        if (verificationResults != null && !verificationResults.isEmpty()) {
-            ArrayNode complianceArray = objectMapper.createArrayNode();
-            for (PDFVerificationResult result : verificationResults) {
-                ObjectNode complianceNode = objectMapper.createObjectNode();
-                complianceNode.put("Standard", result.getStandard());
-                complianceNode.put("Compliant", result.isCompliant());
-                complianceNode.put("Summary", result.getComplianceSummary());
-                complianceArray.add(complianceNode);
+        if (pdfaConformanceLevel != null) {
+            summaryData.put("standardCompliance", "PDF/A-" + pdfaConformanceLevel);
+            summaryData.put("standardPurpose", "long-term archiving");
+            if (pdfaValidationPassed != null) {
+                summaryData.put("standardValidationPassed", pdfaValidationPassed);
             }
-            summaryData.set("Compliance", complianceArray);
+        } else if (checkForStandard(document, "PDF/X")) {
+            summaryData.put("standardCompliance", "PDF/X");
+            summaryData.put("standardPurpose", "graphic exchange");
+        } else if (checkForStandard(document, "PDF/UA")) {
+            summaryData.put("standardCompliance", "PDF/UA");
+            summaryData.put("standardPurpose", "universal accessibility");
+        } else if (checkForStandard(document, "PDF/E")) {
+            summaryData.put("standardCompliance", "PDF/E");
+            summaryData.put("standardPurpose", "engineering workflows");
+        } else if (checkForStandard(document, "PDF/VT")) {
+            summaryData.put("standardCompliance", "PDF/VT");
+            summaryData.put("standardPurpose", "variable and transactional printing");
         }
 
         return summaryData;
@@ -363,113 +591,40 @@ public class GetInfoOnPDF {
         return docInfoNode;
     }
 
-    private static ObjectNode extractComplianceInfo(
-            PDDocument doc, List<PDFVerificationResult> verificationResults) {
+    private static ObjectNode extractComplianceInfo(PDDocument document) {
         ObjectNode compliancy = objectMapper.createObjectNode();
 
-        boolean isPdfA = false;
-        boolean isPdfUA = false;
-        boolean isPdfX = false;
-        boolean isPdfE = false;
-        boolean isPdfB = false;
-        String pdfAConformanceLevel = null;
+        try {
+            String pdfaConformanceLevel = getPdfAConformanceLevel(document);
+            boolean isPdfACompliant = pdfaConformanceLevel != null;
+            boolean isPdfXCompliant = checkForStandard(document, "PDF/X");
+            boolean isPdfECompliant = checkForStandard(document, "PDF/E");
+            boolean isPdfVTCompliant = checkForStandard(document, "PDF/VT");
+            boolean isPdfUACompliant = checkForStandard(document, "PDF/UA");
+            boolean isPdfBCompliant = checkForStandard(document, "PDF/B");
+            boolean isPdfSECCompliant = checkForStandard(document, "PDF/SEC");
 
-        if (verificationResults != null) {
-            for (PDFVerificationResult result : verificationResults) {
-                if (result == null) continue;
-                if (result.isCompliant()) {
-                    String std = result.getStandard().toLowerCase();
-                    if (std.contains("pdf_a") || std.contains("pdfa")) {
-                        isPdfA = true;
-                        String profile = result.getValidationProfile();
-                        if (profile != null) {
-                            if (profile.contains("1b")
-                                    || profile.contains("2b")
-                                    || profile.contains("3b")) {
-                                isPdfB = true;
-                            }
-                            // Simple extraction: remove "pdfa-" prefix
-                            pdfAConformanceLevel = profile.replace("pdfa-", "");
-                        }
-                    }
-                    if (std.contains("pdf_ua") || std.contains("pdfua")) isPdfUA = true;
-                    if (std.contains("pdf_x") || std.contains("pdfx")) isPdfX = true;
-                    if (std.contains("pdf_e") || std.contains("pdfe")) isPdfE = true;
-                }
+            compliancy.put("IsPDF/ACompliant", isPdfACompliant);
+            if (pdfaConformanceLevel != null) {
+                compliancy.put("PDF/AConformanceLevel", pdfaConformanceLevel);
+                Boolean pdfaValidationPassed =
+                        validatePdfAWithPreflight(document, pdfaConformanceLevel);
+                compliancy.put("IsPDF/AValidated", pdfaValidationPassed);
             }
-        }
+            compliancy.put("IsPDF/XCompliant", isPdfXCompliant);
+            compliancy.put("IsPDF/ECompliant", isPdfECompliant);
+            compliancy.put("IsPDF/VTCompliant", isPdfVTCompliant);
+            compliancy.put("IsPDF/UACompliant", isPdfUACompliant);
+            compliancy.put("IsPDF/BCompliant", isPdfBCompliant);
+            compliancy.put("IsPDF/SECCompliant", isPdfSECCompliant);
 
-        compliancy.put("IsPDF/ACompliant", isPdfA);
-        compliancy.put("IsPDF/UACompliant", isPdfUA);
-        compliancy.put("IsPDF/ECompliant", isPdfE);
-        compliancy.put("IsPDF/VTCompliant", false); // Not currently implemented
-        compliancy.put("IsPDF/BCompliant", isPdfB);
-        if (pdfAConformanceLevel != null) {
-            compliancy.put("PDF/AConformanceLevel", pdfAConformanceLevel);
-        }
-
-        compliancy.put("IsPDF/SECCompliant", isSECCompliant(doc));
-
-        if (verificationResults != null && !verificationResults.isEmpty()) {
-            // Keep original simple structure as backup or extra info
-            for (PDFVerificationResult result : verificationResults) {
-                if (result == null) continue;
-                String standard = result.getStandard();
-                boolean isCompliant = result.isCompliant();
-
-                if (standard != null) {
-                    // Avoid overwriting specific keys if collision, but here keys are distinct
-                    // enough
-                    compliancy.put(standard, isCompliant);
-                }
-            }
+        } catch (Exception e) {
+            log.error("Error extracting compliance info: {}", e.getMessage());
         }
 
         return compliancy;
     }
 
-    private static boolean isSECCompliant(PDDocument doc) {
-        try {
-            // 1. Check Encryption
-            if (doc.isEncrypted()) return false;
-
-            PDDocumentCatalog catalog = doc.getDocumentCatalog();
-
-            // 2. Check for JavaScript (Active Content)
-            if (catalog.getOpenAction() instanceof PDActionJavaScript) return false;
-            if (catalog.getNames() != null && catalog.getNames().getJavaScript() != null)
-                return false;
-
-            // Check for AcroForm
-            if (catalog.getAcroForm() != null) return false;
-
-            // 3. Check for Embedded Files
-            if (catalog.getNames() != null && catalog.getNames().getEmbeddedFiles() != null)
-                return false;
-
-            // 4. Check for External Links or Navigation Actions
-            for (PDPage page : doc.getPages()) {
-                for (PDAnnotation annotation : page.getAnnotations()) {
-                    if (annotation instanceof PDAnnotationLink) {
-                        PDAnnotationLink link = (PDAnnotationLink) annotation;
-                        PDAction action = link.getAction();
-                        if (action instanceof PDActionURI
-                                || action instanceof PDActionLaunch
-                                || action instanceof PDActionRemoteGoTo
-                                || action instanceof PDActionSubmitForm) {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            return true;
-        } catch (Exception e) {
-            log.error("Error checking SEC compliance: {}", e.getMessage());
-            return false;
-        }
-    }
-
     private static ObjectNode extractEncryptionInfo(PDDocument document) {
         ObjectNode encryption = objectMapper.createObjectNode();
 
@@ -1060,7 +1215,7 @@ public class GetInfoOnPDF {
         return stats;
     }
 
-    @AutoJobPostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/get-info-on-pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/get-info-on-pdf")
     @Operation(
             summary = "Get comprehensive PDF information",
             description =
@@ -1076,13 +1231,6 @@ public class GetInfoOnPDF {
             return createErrorResponse("Invalid PDF file: " + e.getMessage());
         }
 
-        List<PDFVerificationResult> verificationResults = null;
-        try {
-            verificationResults = veraPDFService.validatePDF(inputFile.getInputStream());
-        } catch (Exception e) {
-            log.error("VeraPDF validation failed", e);
-        }
-
         boolean readonly = true;
 
         try (PDDocument pdfBoxDoc = pdfDocumentFactory.load(inputFile, readonly)) {
@@ -1091,13 +1239,20 @@ public class GetInfoOnPDF {
             ObjectNode metadata = extractMetadata(pdfBoxDoc);
             ObjectNode basicInfo = extractBasicInfo(pdfBoxDoc, inputFile.getSize());
             ObjectNode docInfoNode = extractDocumentInfo(pdfBoxDoc);
-            ObjectNode compliancy = extractComplianceInfo(pdfBoxDoc, verificationResults);
+            ObjectNode compliancy = extractComplianceInfo(pdfBoxDoc);
             ObjectNode encryption = extractEncryptionInfo(pdfBoxDoc);
             ObjectNode permissionsNode = extractPermissions(pdfBoxDoc);
             ObjectNode other = extractOtherInfo(pdfBoxDoc);
             ObjectNode formFieldsNode = extractFormFields(pdfBoxDoc);
 
-            ObjectNode summaryData = generatePDFSummaryData(pdfBoxDoc, verificationResults);
+            // Generate summary data
+            String pdfaConformanceLevel = getPdfAConformanceLevel(pdfBoxDoc);
+            Boolean pdfaValidationPassed = null;
+            if (pdfaConformanceLevel != null) {
+                pdfaValidationPassed = validatePdfAWithPreflight(pdfBoxDoc, pdfaConformanceLevel);
+            }
+            ObjectNode summaryData =
+                    generatePDFSummaryData(pdfBoxDoc, pdfaConformanceLevel, pdfaValidationPassed);
 
             // Extract per-page information
             ObjectNode pageInfoParent = extractPerPageInfo(pdfBoxDoc);

app/core/src/main/java/stirling/software/SPDF/controller/api/security/VerifyPDFController.java

@@ -6,12 +6,16 @@ import java.util.List;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.verapdf.core.EncryptedPdfException;
 import org.verapdf.core.ModelParsingException;
 import org.verapdf.core.ValidationException;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,11 +23,11 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.security.PDFVerificationRequest;
 import stirling.software.SPDF.model.api.security.PDFVerificationResult;
 import stirling.software.SPDF.service.VeraPDFService;
-import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.util.ExceptionUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class VerifyPDFController {
@@ -37,7 +41,7 @@ public class VerifyPDFController {
                             + "Automatically detects PDF/A, PDF/UA-1, PDF/UA-2, and WTPDF standards "
                             + "from the document's XMP metadata and validates compliance. "
                             + "Input:PDF Output:JSON Type:SISO")
-    @AutoJobPostMapping(value = "/verify-pdf", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/verify-pdf", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<List<PDFVerificationResult>> verifyPDF(
             @ModelAttribute PDFVerificationRequest request) {
 

app/core/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -0,0 +1,221 @@
+package stirling.software.SPDF.controller.web;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.servlet.ModelAndView;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import stirling.software.SPDF.config.EndpointConfiguration;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.ApplicationContextProvider;
+import stirling.software.common.util.CheckProgramInstall;
+
+@Controller
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConverterWebController {
+
+    @GetMapping("/img-to-pdf")
+    @Hidden
+    public String convertImgToPdfForm(Model model) {
+        model.addAttribute("currentPage", "img-to-pdf");
+        return "convert/img-to-pdf";
+    }
+
+    @GetMapping("/cbz-to-pdf")
+    @Hidden
+    public String convertCbzToPdfForm(Model model) {
+        model.addAttribute("currentPage", "cbz-to-pdf");
+        return "convert/cbz-to-pdf";
+    }
+
+    @GetMapping("/pdf-to-cbz")
+    @Hidden
+    public String convertPdfToCbzForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-cbz");
+        return "convert/pdf-to-cbz";
+    }
+
+    @GetMapping("/cbr-to-pdf")
+    @Hidden
+    public String convertCbrToPdfForm(Model model) {
+        model.addAttribute("currentPage", "cbr-to-pdf");
+        return "convert/cbr-to-pdf";
+    }
+
+    @GetMapping("/ebook-to-pdf")
+    @Hidden
+    public String convertEbookToPdfForm(Model model) {
+        model.addAttribute("currentPage", "ebook-to-pdf");
+        return "convert/ebook-to-pdf";
+    }
+
+    @GetMapping("/pdf-to-epub")
+    @Hidden
+    public String convertPdfToEpubForm(Model model) {
+        if (!ApplicationContextProvider.getBean(EndpointConfiguration.class)
+                .isEndpointEnabled("pdf-to-epub")) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+        }
+        model.addAttribute("currentPage", "pdf-to-epub");
+        return "convert/pdf-to-epub";
+    }
+
+    @GetMapping("/pdf-to-cbr")
+    @Hidden
+    public String convertPdfToCbrForm(Model model) {
+        if (!ApplicationContextProvider.getBean(EndpointConfiguration.class)
+                .isEndpointEnabled("pdf-to-cbr")) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND);
+        }
+        model.addAttribute("currentPage", "pdf-to-cbr");
+        return "convert/pdf-to-cbr";
+    }
+
+    @GetMapping("/html-to-pdf")
+    @Hidden
+    public String convertHTMLToPdfForm(Model model) {
+        model.addAttribute("currentPage", "html-to-pdf");
+        return "convert/html-to-pdf";
+    }
+
+    @GetMapping("/markdown-to-pdf")
+    @Hidden
+    public String convertMarkdownToPdfForm(Model model) {
+        model.addAttribute("currentPage", "markdown-to-pdf");
+        return "convert/markdown-to-pdf";
+    }
+
+    @GetMapping("/pdf-to-markdown")
+    @Hidden
+    public String convertPdfToMarkdownForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-markdown");
+        return "convert/pdf-to-markdown";
+    }
+
+    @GetMapping("/url-to-pdf")
+    @Hidden
+    public String convertURLToPdfForm(Model model) {
+        model.addAttribute("currentPage", "url-to-pdf");
+        return "convert/url-to-pdf";
+    }
+
+    @GetMapping("/file-to-pdf")
+    @Hidden
+    public String convertToPdfForm(Model model) {
+        model.addAttribute("currentPage", "file-to-pdf");
+        return "convert/file-to-pdf";
+    }
+
+    // PDF TO......
+
+    @GetMapping("/pdf-to-img")
+    @Hidden
+    public String pdfToimgForm(Model model) {
+        boolean isPython = CheckProgramInstall.isPythonAvailable();
+        ApplicationProperties properties =
+                ApplicationContextProvider.getBean(ApplicationProperties.class);
+        if (properties != null && properties.getSystem() != null) {
+            model.addAttribute("maxDPI", properties.getSystem().getMaxDPI());
+        } else {
+            model.addAttribute("maxDPI", 500); // Default value if not set
+        }
+        model.addAttribute("isPython", isPython);
+        model.addAttribute("currentPage", "pdf-to-img");
+        return "convert/pdf-to-img";
+    }
+
+    @GetMapping("/pdf-to-html")
+    @Hidden
+    public ModelAndView pdfToHTML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-html");
+        modelAndView.addObject("currentPage", "pdf-to-html");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-presentation")
+    @Hidden
+    public ModelAndView pdfToPresentation() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-presentation");
+        modelAndView.addObject("currentPage", "pdf-to-presentation");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-text")
+    @Hidden
+    public ModelAndView pdfToText() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-text");
+        modelAndView.addObject("currentPage", "pdf-to-text");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-word")
+    @Hidden
+    public ModelAndView pdfToWord() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-word");
+        modelAndView.addObject("currentPage", "pdf-to-word");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-xml")
+    @Hidden
+    public ModelAndView pdfToXML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-xml");
+        modelAndView.addObject("currentPage", "pdf-to-xml");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-csv")
+    @Hidden
+    public ModelAndView pdfToCSV() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-csv");
+        modelAndView.addObject("currentPage", "pdf-to-csv");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-pdfa")
+    @Hidden
+    public String pdfToPdfAForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-pdfa");
+        return "convert/pdf-to-pdfa";
+    }
+
+    @GetMapping("/pdf-to-vector")
+    @Hidden
+    public String pdfToVectorForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-vector");
+        return "convert/pdf-to-vector";
+    }
+
+    @GetMapping("/vector-to-pdf")
+    @Hidden
+    public String vectorToPdfForm(Model model) {
+        model.addAttribute("currentPage", "vector-to-pdf");
+        return "convert/vector-to-pdf";
+    }
+
+    @GetMapping("/eml-to-pdf")
+    @Hidden
+    public String convertEmlToPdfForm(Model model) {
+        model.addAttribute("currentPage", "eml-to-pdf");
+        return "convert/eml-to-pdf";
+    }
+
+    @GetMapping("/pdf-to-video")
+    @Hidden
+    public String pdfToVideo(Model model) {
+        ApplicationProperties properties =
+                ApplicationContextProvider.getBean(ApplicationProperties.class);
+        if (properties != null && properties.getSystem() != null) {
+            model.addAttribute("maxDPI", properties.getSystem().getMaxDPI());
+        } else {
+            model.addAttribute("maxDPI", 500);
+        }
+        model.addAttribute("currentPage", "pdf-to-video");
+        return "convert/pdf-to-video";
+    }
+}

app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -0,0 +1,352 @@
+package stirling.software.SPDF.controller.web;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Stream;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.ui.Model;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.model.SignatureFile;
+import stirling.software.SPDF.service.SharedSignatureService;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.service.UserServiceInterface;
+import stirling.software.common.util.ExceptionUtils;
+import stirling.software.common.util.GeneralUtils;
+
+// @Controller // Disabled - Backend-only mode, no Thymeleaf UI
+@Tag(name = "General", description = "General APIs")
+@Slf4j
+public class GeneralWebController {
+
+    private final SharedSignatureService signatureService;
+    private final UserServiceInterface userService;
+    private final ResourceLoader resourceLoader;
+    private final RuntimePathConfig runtimePathConfig;
+
+    public GeneralWebController(
+            SharedSignatureService signatureService,
+            @Autowired(required = false) UserServiceInterface userService,
+            ResourceLoader resourceLoader,
+            RuntimePathConfig runtimePathConfig) {
+        this.signatureService = signatureService;
+        this.userService = userService;
+        this.resourceLoader = resourceLoader;
+        this.runtimePathConfig = runtimePathConfig;
+    }
+
+    @Deprecated
+    // @GetMapping("/pipeline")
+    @Hidden
+    public String pipelineForm(Model model) {
+        model.addAttribute("currentPage", "pipeline");
+        List<String> pipelineConfigs = new ArrayList<>();
+        List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
+        if (new File(runtimePathConfig.getPipelineDefaultWebUiConfigs()).exists()) {
+            try (Stream<Path> paths =
+                    Files.walk(Paths.get(runtimePathConfig.getPipelineDefaultWebUiConfigs()))) {
+                List<Path> jsonFiles =
+                        paths.filter(Files::isRegularFile)
+                                .filter(p -> p.toString().endsWith(".json"))
+                                .toList();
+                for (Path jsonFile : jsonFiles) {
+                    String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
+                    pipelineConfigs.add(content);
+                }
+                for (String config : pipelineConfigs) {
+                    Map<String, Object> jsonContent =
+                            new ObjectMapper()
+                                    .readValue(config, new TypeReference<Map<String, Object>>() {});
+                    String name = (String) jsonContent.get("name");
+                    if (name == null || name.isEmpty()) {
+                        String filename =
+                                jsonFiles
+                                        .get(pipelineConfigs.indexOf(config))
+                                        .getFileName()
+                                        .toString();
+                        name = filename.substring(0, filename.lastIndexOf('.'));
+                    }
+                    Map<String, String> configWithName = new HashMap<>();
+                    configWithName.put("json", config);
+                    configWithName.put("name", name);
+                    pipelineConfigsWithNames.add(configWithName);
+                }
+            } catch (IOException e) {
+                log.error("exception", e);
+            }
+        }
+        if (pipelineConfigsWithNames.isEmpty()) {
+            Map<String, String> configWithName = new HashMap<>();
+            configWithName.put("json", "");
+            configWithName.put("name", "No preloaded configs found");
+            pipelineConfigsWithNames.add(configWithName);
+        }
+        model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
+        model.addAttribute("pipelineConfigs", pipelineConfigs);
+        return "pipeline";
+    }
+
+    @Deprecated
+    // @GetMapping("/merge-pdfs")
+    @Hidden
+    public String mergePdfForm(Model model) {
+        model.addAttribute("currentPage", "merge-pdfs");
+        return "merge-pdfs";
+    }
+
+    @Deprecated
+    // @GetMapping("/split-pdf-by-sections")
+    @Hidden
+    public String splitPdfBySections(Model model) {
+        model.addAttribute("currentPage", "split-pdf-by-sections");
+        return "split-pdf-by-sections";
+    }
+
+    @Deprecated
+    // @GetMapping("/split-pdf-by-chapters")
+    @Hidden
+    public String splitPdfByChapters(Model model) {
+        model.addAttribute("currentPage", "split-pdf-by-chapters");
+        return "split-pdf-by-chapters";
+    }
+
+    @Deprecated
+    // @GetMapping("/view-pdf")
+    @Hidden
+    public String ViewPdfForm2(Model model) {
+        model.addAttribute("currentPage", "view-pdf");
+        return "view-pdf";
+    }
+
+    @Deprecated
+    // @GetMapping("/edit-table-of-contents")
+    @Hidden
+    public String editTableOfContents(Model model) {
+        model.addAttribute("currentPage", "edit-table-of-contents");
+        return "edit-table-of-contents";
+    }
+
+    @Deprecated
+    // @GetMapping("/multi-tool")
+    @Hidden
+    public String multiToolForm(Model model) {
+        model.addAttribute("currentPage", "multi-tool");
+        return "multi-tool";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-pages")
+    @Hidden
+    public String pageDeleter(Model model) {
+        model.addAttribute("currentPage", "remove-pages");
+        return "remove-pages";
+    }
+
+    @Deprecated
+    // @GetMapping("/pdf-organizer")
+    @Hidden
+    public String pageOrganizer(Model model) {
+        model.addAttribute("currentPage", "pdf-organizer");
+        return "pdf-organizer";
+    }
+
+    @Deprecated
+    // @GetMapping("/extract-page")
+    @Hidden
+    public String extractPages(Model model) {
+        model.addAttribute("currentPage", "extract-page");
+        return "extract-page";
+    }
+
+    @Deprecated
+    // @GetMapping("/pdf-to-single-page")
+    @Hidden
+    public String pdfToSinglePage(Model model) {
+        model.addAttribute("currentPage", "pdf-to-single-page");
+        return "pdf-to-single-page";
+    }
+
+    @Deprecated
+    // @GetMapping("/rotate-pdf")
+    @Hidden
+    public String rotatePdfForm(Model model) {
+        model.addAttribute("currentPage", "rotate-pdf");
+        return "rotate-pdf";
+    }
+
+    @Deprecated
+    // @GetMapping("/split-pdfs")
+    @Hidden
+    public String splitPdfForm(Model model) {
+        model.addAttribute("currentPage", "split-pdfs");
+        return "split-pdfs";
+    }
+
+    @Deprecated
+    // @GetMapping("/sign")
+    @Hidden
+    public String signForm(Model model) {
+        String username = "";
+        if (userService != null) {
+            username = userService.getCurrentUsername();
+        }
+        // Get signatures from both personal and ALL_USERS folders
+        List<SignatureFile> signatures = signatureService.getAvailableSignatures(username);
+        model.addAttribute("currentPage", "sign");
+        model.addAttribute("fonts", getFontNames());
+        model.addAttribute("signatures", signatures);
+        return "sign";
+    }
+
+    @Deprecated
+    // @GetMapping("/multi-page-layout")
+    @Hidden
+    public String multiPageLayoutForm(Model model) {
+        model.addAttribute("currentPage", "multi-page-layout");
+        return "multi-page-layout";
+    }
+
+    @Deprecated
+    // @GetMapping("/scale-pages")
+    @Hidden
+    public String scalePagesFrom(Model model) {
+        model.addAttribute("currentPage", "scale-pages");
+        return "scale-pages";
+    }
+
+    @Deprecated
+    // @GetMapping("/split-by-size-or-count")
+    @Hidden
+    public String splitBySizeOrCount(Model model) {
+        model.addAttribute("currentPage", "split-by-size-or-count");
+        return "split-by-size-or-count";
+    }
+
+    @Deprecated
+    // @GetMapping("/overlay-pdf")
+    @Hidden
+    public String overlayPdf(Model model) {
+        model.addAttribute("currentPage", "overlay-pdf");
+        return "overlay-pdf";
+    }
+
+    private List<FontResource> getFontNames() {
+        List<FontResource> fontNames = new ArrayList<>();
+        // Extract font names from classpath
+        fontNames.addAll(getFontNamesFromLocation("classpath:static/fonts/*.woff2"));
+        // Extract font names from external directory
+        fontNames.addAll(
+                getFontNamesFromLocation(
+                        "file:"
+                                + InstallationPathConfig.getStaticPath()
+                                + "fonts"
+                                + File.separator
+                                + "*"));
+        return fontNames;
+    }
+
+    private List<FontResource> getFontNamesFromLocation(String locationPattern) {
+        try {
+            Resource[] resources =
+                    GeneralUtils.getResourcesFromLocationPattern(locationPattern, resourceLoader);
+            return Arrays.stream(resources)
+                    .map(
+                            resource -> {
+                                try {
+                                    String filename = resource.getFilename();
+                                    if (filename != null) {
+                                        int lastDotIndex = filename.lastIndexOf('.');
+                                        if (lastDotIndex != -1) {
+                                            String name = filename.substring(0, lastDotIndex);
+                                            String extension = filename.substring(lastDotIndex + 1);
+                                            return new FontResource(name, extension);
+                                        }
+                                    }
+                                    return null;
+                                } catch (Exception e) {
+                                    throw ExceptionUtils.createRuntimeException(
+                                            "error.fontLoadingFailed",
+                                            "Error processing font file",
+                                            e);
+                                }
+                            })
+                    .filter(Objects::nonNull)
+                    .toList();
+        } catch (Exception e) {
+            throw ExceptionUtils.createRuntimeException(
+                    "error.fontDirectoryReadFailed", "Failed to read font directory", e);
+        }
+    }
+
+    public String getFormatFromExtension(String extension) {
+        return switch (extension) {
+            case "ttf" -> "truetype";
+            case "woff" -> "woff";
+            case "woff2" -> "woff2";
+            case "eot" -> "embedded-opentype";
+            case "svg" -> "svg";
+            default ->
+                    // or throw an exception if an unexpected extension is encountered
+                    "";
+        };
+    }
+
+    @Deprecated
+    // @GetMapping("/crop")
+    @Hidden
+    public String cropForm(Model model) {
+        model.addAttribute("currentPage", "crop");
+        return "crop";
+    }
+
+    @Deprecated
+    // @GetMapping("/auto-split-pdf")
+    @Hidden
+    public String autoSPlitPDFForm(Model model) {
+        model.addAttribute("currentPage", "auto-split-pdf");
+        return "auto-split-pdf";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-image-pdf")
+    @Hidden
+    public String removeImagePdfForm(Model model) {
+        model.addAttribute("currentPage", "remove-image-pdf");
+        return "remove-image-pdf";
+    }
+
+    @Setter
+    @Getter
+    public class FontResource {
+
+        private String name;
+
+        private String extension;
+
+        private String type;
+
+        public FontResource(String name, String extension) {
+            this.name = name;
+            this.extension = extension;
+            this.type = getFormatFromExtension(extension);
+        }
+    }
+}

app/core/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -0,0 +1,98 @@
+package stirling.software.SPDF.controller.web;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.MediaType;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.model.Dependency;
+import stirling.software.common.model.ApplicationProperties;
+
+@Slf4j
+// @Controller // Disabled - Backend-only mode, no Thymeleaf UI
+@RequiredArgsConstructor
+public class HomeWebController {
+
+    private final ApplicationProperties applicationProperties;
+
+    @Deprecated
+    // @GetMapping("/about")
+    @Hidden
+    public String gameForm(Model model) {
+        model.addAttribute("currentPage", "about");
+        return "about";
+    }
+
+    @Deprecated
+    // @GetMapping("/licenses")
+    @Hidden
+    public String licensesForm(Model model) {
+        model.addAttribute("currentPage", "licenses");
+        Resource resource = new ClassPathResource("static/3rdPartyLicenses.json");
+        try (InputStream is = resource.getInputStream()) {
+            String json = new String(is.readAllBytes(), StandardCharsets.UTF_8);
+            ObjectMapper mapper = new ObjectMapper();
+            Map<String, List<Dependency>> data = mapper.readValue(json, new TypeReference<>() {});
+            model.addAttribute("dependencies", data.get("dependencies"));
+        } catch (IOException e) {
+            log.error("exception", e);
+        }
+        return "licenses";
+    }
+
+    @Deprecated
+    // @GetMapping("/releases")
+    public String getReleaseNotes(Model model) {
+        return "releases";
+    }
+
+    @Deprecated
+    // @GetMapping("/")
+    public String home(Model model) {
+        model.addAttribute("currentPage", "home");
+        String showSurvey = System.getenv("SHOW_SURVEY");
+        boolean showSurveyValue = showSurvey == null || "true".equalsIgnoreCase(showSurvey);
+        model.addAttribute("showSurveyFromDocker", showSurveyValue);
+        return "home";
+    }
+
+    @Deprecated
+    // @GetMapping("/home")
+    public String root(Model model) {
+        return "redirect:/";
+    }
+
+    @Deprecated
+    // @GetMapping("/home-legacy")
+    public String redirectHomeLegacy() {
+        return "redirect:/";
+    }
+
+    @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)
+    @ResponseBody
+    @Hidden
+    public String getRobotsTxt() {
+        boolean allowGoogle = applicationProperties.getSystem().isGooglevisibility();
+        if (allowGoogle) {
+            return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /";
+        } else {
+            return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /";
+        }
+    }
+}

app/core/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -0,0 +1,231 @@
+package stirling.software.SPDF.controller.web;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.ModelAndView;
+
+import io.swagger.v3.oas.annotations.Hidden;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.CheckProgramInstall;
+
+// @Controller // Disabled - Backend-only mode, no Thymeleaf UI
+@RequiredArgsConstructor
+@Slf4j
+public class OtherWebController {
+
+    private final ApplicationProperties applicationProperties;
+    private final RuntimePathConfig runtimePathConfig;
+
+    @Deprecated
+    // @GetMapping("/compress-pdf")
+    @Hidden
+    public String compressPdfForm(Model model) {
+        model.addAttribute("currentPage", "compress-pdf");
+        return "misc/compress-pdf";
+    }
+
+    @Deprecated
+    // @GetMapping("/replace-and-invert-color-pdf")
+    @Hidden
+    public String replaceAndInvertColorPdfForm(Model model) {
+        model.addAttribute("currentPage", "replace-invert-color-pdf");
+        return "misc/replace-color";
+    }
+
+    @Deprecated
+    // @GetMapping("/extract-image-scans")
+    @Hidden
+    public ModelAndView extractImageScansForm() {
+        ModelAndView modelAndView = new ModelAndView("misc/extract-image-scans");
+        boolean isPython = CheckProgramInstall.isPythonAvailable();
+        modelAndView.addObject("isPython", isPython);
+        modelAndView.addObject("currentPage", "extract-image-scans");
+        return modelAndView;
+    }
+
+    @Deprecated
+    // @GetMapping("/show-javascript")
+    @Hidden
+    public String extractJavascriptForm(Model model) {
+        model.addAttribute("currentPage", "show-javascript");
+        return "misc/show-javascript";
+    }
+
+    @Deprecated
+    // @GetMapping("/stamp")
+    @Hidden
+    public String stampForm(Model model) {
+        model.addAttribute("currentPage", "stamp");
+        return "misc/stamp";
+    }
+
+    @Deprecated
+    // @GetMapping("/add-page-numbers")
+    @Hidden
+    public String addPageNumbersForm(Model model) {
+        model.addAttribute("currentPage", "add-page-numbers");
+        return "misc/add-page-numbers";
+    }
+
+    @Deprecated
+    // @GetMapping("/scanner-effect")
+    @Hidden
+    public String scannerEffectForm(Model model) {
+        model.addAttribute("currentPage", "scanner-effect");
+        return "misc/scanner-effect";
+    }
+
+    @Deprecated
+    // @GetMapping("/extract-images")
+    @Hidden
+    public String extractImagesForm(Model model) {
+        model.addAttribute("currentPage", "extract-images");
+        return "misc/extract-images";
+    }
+
+    @Deprecated
+    // @GetMapping("/flatten")
+    @Hidden
+    public String flattenForm(Model model) {
+        model.addAttribute("currentPage", "flatten");
+        return "misc/flatten";
+    }
+
+    @Deprecated
+    // @GetMapping("/change-metadata")
+    @Hidden
+    public String addWatermarkForm(Model model) {
+        model.addAttribute("currentPage", "change-metadata");
+        return "misc/change-metadata";
+    }
+
+    @Deprecated
+    // @GetMapping("/unlock-pdf-forms")
+    @Hidden
+    public String unlockPDFForms(Model model) {
+        model.addAttribute("currentPage", "unlock-pdf-forms");
+        return "misc/unlock-pdf-forms";
+    }
+
+    @Deprecated
+    // @GetMapping("/compare")
+    @Hidden
+    public String compareForm(Model model) {
+        model.addAttribute("currentPage", "compare");
+        return "misc/compare";
+    }
+
+    @Deprecated
+    // @GetMapping("/print-file")
+    @Hidden
+    public String printFileForm(Model model) {
+        model.addAttribute("currentPage", "print-file");
+        return "misc/print-file";
+    }
+
+    public List<String> getAvailableTesseractLanguages() {
+        String tessdataDir = runtimePathConfig.getTessDataPath();
+        File[] files = new File(tessdataDir).listFiles();
+        if (files == null) {
+            return Collections.emptyList();
+        }
+        return Arrays.stream(files)
+                .filter(file -> file.getName().endsWith(".traineddata"))
+                .map(file -> file.getName().replace(".traineddata", ""))
+                .filter(lang -> !"osd".equalsIgnoreCase(lang))
+                .sorted()
+                .toList();
+    }
+
+    @Deprecated
+    // @GetMapping("/ocr-pdf")
+    @Hidden
+    public ModelAndView ocrPdfPage() {
+        ModelAndView modelAndView = new ModelAndView("misc/ocr-pdf");
+        List<String> languages = getAvailableTesseractLanguages();
+        modelAndView.addObject("languages", languages);
+        modelAndView.addObject("currentPage", "ocr-pdf");
+        return modelAndView;
+    }
+
+    @Deprecated
+    // @GetMapping("/add-image")
+    @Hidden
+    public String overlayImage(Model model) {
+        model.addAttribute("currentPage", "add-image");
+        return "misc/add-image";
+    }
+
+    @Deprecated
+    // @GetMapping("/adjust-contrast")
+    @Hidden
+    public String contrast(Model model) {
+        model.addAttribute("currentPage", "adjust-contrast");
+        return "misc/adjust-contrast";
+    }
+
+    @Deprecated
+    // @GetMapping("/repair")
+    @Hidden
+    public String repairForm(Model model) {
+        model.addAttribute("currentPage", "repair");
+        return "misc/repair";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-blanks")
+    @Hidden
+    public String removeBlanksForm(Model model) {
+        model.addAttribute("currentPage", "remove-blanks");
+        return "misc/remove-blanks";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-annotations")
+    @Hidden
+    public String removeAnnotationsForm(Model model) {
+        model.addAttribute("currentPage", "remove-annotations");
+        return "misc/remove-annotations";
+    }
+
+    @Deprecated
+    // @GetMapping("/auto-crop")
+    @Hidden
+    public String autoCropForm(Model model) {
+        model.addAttribute("currentPage", "auto-crop");
+        return "misc/auto-crop";
+    }
+
+    @Deprecated
+    // @GetMapping("/auto-rename")
+    @Hidden
+    public String autoRenameForm(Model model) {
+        model.addAttribute("currentPage", "auto-rename");
+        return "misc/auto-rename";
+    }
+
+    @Deprecated
+    // @GetMapping("/add-attachments")
+    @Hidden
+    public String attachmentsForm(Model model) {
+        model.addAttribute("currentPage", "add-attachments");
+        return "misc/add-attachments";
+    }
+
+    @Deprecated
+    // @GetMapping("/extract-attachments")
+    @Hidden
+    public String extractAttachmentsForm(Model model) {
+        model.addAttribute("currentPage", "extract-attachments");
+        return "misc/extract-attachments";
+    }
+}

app/core/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java

@@ -0,0 +1,98 @@
+package stirling.software.SPDF.controller.web;
+
+import org.springframework.ui.Model;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+// @Controller // Disabled - Backend-only mode, no Thymeleaf UI
+@Tag(name = "Security", description = "Security APIs")
+public class SecurityWebController {
+
+    @Deprecated
+    // @GetMapping("/auto-redact")
+    @Hidden
+    public String autoRedactForm(Model model) {
+        model.addAttribute("currentPage", "auto-redact");
+        return "security/auto-redact";
+    }
+
+    @Deprecated
+    // @GetMapping("/redact")
+    public String redactForm(Model model) {
+        model.addAttribute("currentPage", "redact");
+        return "security/redact";
+    }
+
+    @Deprecated
+    // @GetMapping("/add-password")
+    @Hidden
+    public String addPasswordForm(Model model) {
+        model.addAttribute("currentPage", "add-password");
+        return "security/add-password";
+    }
+
+    @Deprecated
+    // @GetMapping("/change-permissions")
+    @Hidden
+    public String permissionsForm(Model model) {
+        model.addAttribute("currentPage", "change-permissions");
+        return "security/change-permissions";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-password")
+    @Hidden
+    public String removePasswordForm(Model model) {
+        model.addAttribute("currentPage", "remove-password");
+        return "security/remove-password";
+    }
+
+    @Deprecated
+    // @GetMapping("/add-watermark")
+    @Hidden
+    public String addWatermarkForm(Model model) {
+        model.addAttribute("currentPage", "add-watermark");
+        return "security/add-watermark";
+    }
+
+    @Deprecated
+    // @GetMapping("/cert-sign")
+    @Hidden
+    public String certSignForm(Model model) {
+        model.addAttribute("currentPage", "cert-sign");
+        return "security/cert-sign";
+    }
+
+    @Deprecated
+    // @GetMapping("/validate-signature")
+    @Hidden
+    public String certSignVerifyForm(Model model) {
+        model.addAttribute("currentPage", "validate-signature");
+        return "security/validate-signature";
+    }
+
+    @Deprecated
+    // @GetMapping("/remove-cert-sign")
+    @Hidden
+    public String certUnSignForm(Model model) {
+        model.addAttribute("currentPage", "remove-cert-sign");
+        return "security/remove-cert-sign";
+    }
+
+    @Deprecated
+    // @GetMapping("/sanitize-pdf")
+    @Hidden
+    public String sanitizeForm(Model model) {
+        model.addAttribute("currentPage", "sanitize-pdf");
+        return "security/sanitize-pdf";
+    }
+
+    @Deprecated
+    // @GetMapping("/get-info-on-pdf")
+    @Hidden
+    public String getInfo(Model model) {
+        model.addAttribute("currentPage", "get-info-on-pdf");
+        return "security/get-info-on-pdf";
+    }
+}

app/core/src/main/java/stirling/software/SPDF/model/PipelineResult.java

@@ -1,37 +1,14 @@
 package stirling.software.SPDF.model;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.core.io.Resource;
 
 import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.util.TempFile;
 
 @Data
-@Slf4j
-public class PipelineResult implements AutoCloseable {
+public class PipelineResult {
     private List<Resource> outputFiles;
     private boolean hasErrors;
     private boolean filtersApplied;
-    private List<TempFile> tempFiles = new ArrayList<>();
-
-    public void addTempFile(TempFile tempFile) {
-        tempFiles.add(tempFile);
-    }
-
-    @Override
-    public void close() {
-        for (TempFile file : tempFiles) {
-            file.close();
-            log.debug("Deleted temp file: {}", file.getAbsolutePath());
-        }
-        tempFiles.clear();
-    }
-
-    public void cleanup() {
-        close();
-    }
 }

app/core/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java

@@ -14,6 +14,9 @@ public class PdfToPdfARequest extends PDFFile {
     @Schema(
             description = "The output format type (PDF/A or PDF/X)",
             requiredMode = Schema.RequiredMode.REQUIRED,
-            allowableValues = {"pdfa", "pdfa-1", "pdfa-2", "pdfa-2b", "pdfa-3", "pdfa-3b", "pdfx"})
+            allowableValues = {
+                "pdfa", "pdfa-1", "pdfa-2", "pdfa-2b", "pdfa-3", "pdfa-3b", "pdfx", "pdfx-1",
+                "pdfx-3", "pdfx-4"
+            })
     private String outputFormat;
 }

app/core/src/main/java/stirling/software/SPDF/model/api/converters/SvgToPdfRequest.java

@@ -1,29 +0,0 @@
-package stirling.software.SPDF.model.api.converters;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode
-public class SvgToPdfRequest {
-
-    @Schema(
-            description =
-                    "The SVG file(s) to be converted to PDF. "
-                            + "SVGs are scalable and have inherent dimensions - the conversion uses these dimensions "
-                            + "to determine the PDF page size. If dimensions are not specified in the SVG, A4 size is used.",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private MultipartFile[] fileInput;
-
-    @Schema(
-            description =
-                    "Whether to combine all SVG files into a single PDF (each SVG as a separate page) "
-                            + "or create separate PDF files for each SVG.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "false")
-    private Boolean combineIntoSinglePdf;
-}

app/core/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java

@@ -14,10 +14,7 @@ import stirling.software.common.model.api.PDFFile;
 public class OverlayImageRequest extends PDFFile {
 
     @Schema(
-            description =
-                    "The image file to be overlaid onto the PDF. "
-                            + "Supports raster formats (PNG, JPEG, etc.) and vector format (SVG). "
-                            + "SVG files are rendered as vector graphics for crisp output at any resolution.",
+            description = "The image file to be overlaid onto the PDF.",
             requiredMode = Schema.RequiredMode.REQUIRED,
             format = "binary")
     private MultipartFile imageFile;

app/core/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java

@@ -2,7 +2,6 @@ package stirling.software.SPDF.service;
 
 import java.io.*;
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
@@ -511,7 +510,7 @@ public class CertificateValidationService {
     private byte[] downloadTrustList(String urlStr) {
         HttpURLConnection conn = null;
         try {
-            URL url = URI.create(urlStr).toURL();
+            URL url = new URL(urlStr);
             conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("GET");
             conn.setConnectTimeout(10_000);
@@ -701,7 +700,7 @@ public class CertificateValidationService {
     private byte[] downloadXml(String urlStr) {
         HttpURLConnection conn = null;
         try {
-            URL url = URI.create(urlStr).toURL();
+            URL url = new URL(urlStr);
             conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("GET");
             conn.setConnectTimeout(10_000);

app/core/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java

@@ -3424,7 +3424,7 @@ public class PdfJsonConversionService {
                         }
                         break;
                     case "Tj":
-                        if (i == 0 || !(tokens.get(i - 1) instanceof COSString)) {
+                        if (i == 0 || !(tokens.get(i - 1) instanceof COSString cosString)) {
                             log.debug(
                                     "Encountered Tj without preceding string operand; aborting rewrite");
                             return false;
@@ -3435,8 +3435,7 @@ public class PdfJsonConversionService {
                                 i,
                                 cursor.remaining());
                         if (!rewriteShowText(
-                                tokens,
-                                i - 1,
+                                cosString,
                                 currentFont,
                                 currentFontModel,
                                 currentFontName,
@@ -3497,8 +3496,7 @@ public class PdfJsonConversionService {
     }
 
     private boolean rewriteShowText(
-            List<Object> tokens,
-            int tokenIndex,
+            COSString cosString,
             PDFont font,
             PdfJsonFont fontModel,
             String expectedFontName,
@@ -3511,7 +3509,6 @@ public class PdfJsonConversionService {
                     expectedFontName);
             return false;
         }
-        COSString cosString = (COSString) tokens.get(tokenIndex);
         int glyphCount = countGlyphs(cosString, font);
         log.trace(
                 "rewriteShowText consuming {} glyphs at cursor index {} for font {}",
@@ -3528,7 +3525,7 @@ public class PdfJsonConversionService {
             return false;
         }
         if (removeOnly) {
-            tokens.set(tokenIndex, new COSString(new byte[0]));
+            cosString.setValue(new byte[0]);
             return true;
         }
         MergedText replacement = mergeText(consumed);
@@ -3543,7 +3540,7 @@ public class PdfJsonConversionService {
                         replacement.text());
                 return false;
             }
-            tokens.set(tokenIndex, new COSString(encoded));
+            cosString.setValue(encoded);
             return true;
         } catch (IOException | IllegalArgumentException | UnsupportedOperationException ex) {
             log.debug(

app/core/src/main/java/stirling/software/SPDF/service/VeraPDFService.java

@@ -204,65 +204,11 @@ public class VeraPDFService {
             detectedFlavours = detectionParser.getFlavours();
         }
 
-        // For PDF/A flavours, we need to validate first to check if PDF/A identification exists in
-        // XMP
-        // If declaredFlavour is PDF/A, do a quick validation to check for PDF/A identification
-        // schema
-        boolean hasValidPdfaMetadata = false;
-        if (isPdfaFlavour(declaredFlavour)) {
-            try (PDFAParser quickParser =
-                    Foundries.defaultInstance()
-                            .createParser(new ByteArrayInputStream(pdfBytes), declaredFlavour)) {
-                PDFAValidator quickValidator =
-                        Foundries.defaultInstance().createValidator(declaredFlavour, false);
-                ValidationResult quickResult = quickValidator.validate(quickParser);
-
-                // Check if the document has the PDF/A Identification extension schema (clause
-                // 6.7.11, test 1)
-                // OR if it lacks XMP metadata entirely (clause 6.7.2, test 1)
-                // If either of these errors is present, the document is NOT a declared PDF/A
-                hasValidPdfaMetadata = true;
-                for (TestAssertion assertion : quickResult.getTestAssertions()) {
-                    if (assertion.getStatus() == TestAssertion.Status.FAILED
-                            && assertion.getRuleId() != null) {
-                        String clause = assertion.getRuleId().getClause();
-                        int testNumber = assertion.getRuleId().getTestNumber();
-
-                        // Missing XMP metadata entirely (clause 6.7.2, test 1)
-                        if ("6.7.2".equals(clause) && testNumber == 1) {
-                            hasValidPdfaMetadata = false;
-                            log.debug(
-                                    "Document lacks XMP metadata (6.7.2): {}",
-                                    assertion.getMessage());
-                            break;
-                        }
-
-                        // Missing PDF/A identification schema in XMP (clause 6.7.11, test 1)
-                        if ("6.7.11".equals(clause) && testNumber == 1) {
-                            hasValidPdfaMetadata = false;
-                            log.debug(
-                                    "Document lacks PDF/A identification in XMP (6.7.11): {}",
-                                    assertion.getMessage());
-                            break;
-                        }
-                    }
-                }
-            } catch (Exception e) {
-                log.debug("Error checking for PDF/A identification: {}", e.getMessage());
-                hasValidPdfaMetadata = false;
-            }
-        }
-
         List<PDFAFlavour> flavoursToValidate = new ArrayList<>();
-        boolean hasPdfaDeclaration = isPdfaFlavour(declaredFlavour) && hasValidPdfaMetadata;
+        boolean hasPdfaDeclaration = isPdfaFlavour(declaredFlavour);
 
         if (declaredFlavour != null) {
-            boolean isDeclaredPdfa = isPdfaFlavour(declaredFlavour);
-            if (isDeclaredPdfa && hasPdfaDeclaration) {
-                flavoursToValidate.add(declaredFlavour);
-            } else if (!isDeclaredPdfa) {
-                flavoursToValidate.add(declaredFlavour);
-            }
+            flavoursToValidate.add(declaredFlavour);
         }
 
         for (PDFAFlavour flavour : detectedFlavours) {

app/core/src/main/java/stirling/software/SPDF/service/telegram/FeedbackEnum.java

@@ -1,20 +0,0 @@
-package stirling.software.SPDF.service.telegram;
-
-/**
- * Enumeration representing different feedback types for Telegram service.
- *
- * @since 2.2.x
- */
-public enum FeedbackEnum {
-    /** Indicates that the provided document is not valid. */
-    NO_VALID_DOCUMENT,
-
-    /** Represents a generic error message. */
-    ERROR_MESSAGE,
-
-    /** Indicates that an error occurred during processing. */
-    ERROR_PROCESSING,
-
-    /** Indicates that processing is ongoing. */
-    PROCESSING
-}

app/core/src/main/java/stirling/software/SPDF/service/telegram/TelegramPipelineBot.java

@@ -1,519 +0,0 @@
-package stirling.software.SPDF.service.telegram;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Stream;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-import org.telegram.telegrambots.bots.TelegramLongPollingBot;
-import org.telegram.telegrambots.meta.TelegramBotsApi;
-import org.telegram.telegrambots.meta.api.methods.GetFile;
-import org.telegram.telegrambots.meta.api.methods.send.SendDocument;
-import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
-import org.telegram.telegrambots.meta.api.objects.Chat;
-import org.telegram.telegrambots.meta.api.objects.Document;
-import org.telegram.telegrambots.meta.api.objects.File;
-import org.telegram.telegrambots.meta.api.objects.InputFile;
-import org.telegram.telegrambots.meta.api.objects.Message;
-import org.telegram.telegrambots.meta.api.objects.Update;
-import org.telegram.telegrambots.meta.api.objects.User;
-import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.configuration.RuntimePathConfig;
-import stirling.software.common.model.ApplicationProperties;
-
-/**
- * Telegram bot that processes incoming files through a defined pipeline.
- *
- * @since 2.2.x
- */
-@Slf4j
-@Component
-@ConditionalOnProperty(prefix = "telegram", name = "enabled", havingValue = "true")
-public class TelegramPipelineBot extends TelegramLongPollingBot {
-
-    private static final String CHAT_PRIVATE = "private";
-    private static final String CHAT_GROUP = "group";
-    private static final String CHAT_SUPERGROUP = "supergroup";
-    private static final String CHAT_CHANNEL = "channel";
-
-    private static final Set<String> SUPPORTED_CHAT_TYPES =
-            Set.of(CHAT_PRIVATE, CHAT_GROUP, CHAT_SUPERGROUP, CHAT_CHANNEL);
-
-    private static final Set<String> ALLOWED_MIME_TYPES = Set.of("application/pdf");
-
-    private final Object pipelinePollMonitor = new Object();
-
-    private final ApplicationProperties.Telegram telegramProperties;
-    private final RuntimePathConfig runtimePathConfig;
-    private final TelegramBotsApi telegramBotsApi;
-
-    public TelegramPipelineBot(
-            ApplicationProperties applicationProperties,
-            RuntimePathConfig runtimePathConfig,
-            TelegramBotsApi telegramBotsApi) {
-
-        super(applicationProperties.getTelegram().getBotToken());
-        this.telegramProperties = applicationProperties.getTelegram();
-        this.runtimePathConfig = runtimePathConfig;
-        this.telegramBotsApi = telegramBotsApi;
-    }
-
-    @PostConstruct
-    public void register() {
-        if (StringUtils.isAnyBlank(getBotUsername(), this.telegramProperties.getBotToken())) {
-            log.warn("Telegram bot disabled because botToken or botUsername is not configured");
-            return;
-        }
-        try {
-            telegramBotsApi.registerBot(this);
-            log.info("Telegram pipeline bot registered as {}", getBotUsername());
-        } catch (TelegramApiException e) {
-            log.error("Failed to register Telegram bot", e);
-        }
-    }
-
-    @Override
-    public void onUpdateReceived(Update update) {
-        Message message = extractMessage(update);
-        if (message == null) {
-            return;
-        }
-
-        Chat chat = message.getChat();
-        if (chat == null || !isSupportedChatType(chat.getType())) {
-            log.info(
-                    "Ignoring message {}, unsupported chat type {}",
-                    message.getMessageId(),
-                    chat != null ? chat.getType() : "null");
-            return;
-        }
-
-        if (!isAuthorized(message, chat)) {
-            return;
-        }
-
-        if (update.hasMessage() && update.getMessage().hasText()) {
-            String messageText = update.getMessage().getText();
-            long chatId = update.getMessage().getChatId();
-            if ("/start".equals(messageText)) {
-                sendMessage(
-                        chatId,
-                        """
-                        Welcome to the SPDF Telegram Bot!
-
-                        To get started, please send me a PDF document that you would like to process.
-                        Make sure the document is in PDF format.
-
-                        Once I receive your document, I'll begin processing it through the pipeline.
-                        """);
-                return;
-            }
-        }
-
-        if (message.hasDocument()) {
-            handleIncomingFile(message);
-            return;
-        }
-        if (feedback(FeedbackEnum.NO_VALID_DOCUMENT, chat.getType())) {
-            sendMessage(
-                    chat.getId(),
-                    "No valid file found in the message. Please send a document to process.");
-        }
-    }
-
-    private boolean feedback(FeedbackEnum feedbackEnum, String chatType) {
-        return switch (feedbackEnum) {
-            case NO_VALID_DOCUMENT ->
-                    switch (chatType) {
-                        case CHAT_CHANNEL ->
-                                telegramProperties.getFeedback().getChannel().getNoValidDocument();
-                        case CHAT_PRIVATE ->
-                                telegramProperties.getFeedback().getUser().getNoValidDocument();
-                        default -> true;
-                    };
-            case ERROR_MESSAGE ->
-                    switch (chatType) {
-                        case CHAT_CHANNEL ->
-                                telegramProperties.getFeedback().getChannel().getErrorMessage();
-                        case CHAT_PRIVATE ->
-                                telegramProperties.getFeedback().getUser().getErrorMessage();
-                        default -> true;
-                    };
-            case ERROR_PROCESSING ->
-                    switch (chatType) {
-                        case CHAT_CHANNEL ->
-                                telegramProperties.getFeedback().getChannel().getErrorProcessing();
-                        case CHAT_PRIVATE ->
-                                telegramProperties.getFeedback().getUser().getErrorProcessing();
-                        default -> true;
-                    };
-            case PROCESSING ->
-                    switch (chatType) {
-                        case CHAT_CHANNEL ->
-                                telegramProperties.getFeedback().getChannel().getProcessing();
-                        case CHAT_PRIVATE ->
-                                telegramProperties.getFeedback().getUser().getProcessing();
-                        default -> true;
-                    };
-            default -> true;
-        };
-    }
-
-    // ---------------------------
-    // Message Extraction / Chat Type
-    // ---------------------------
-
-    private Message extractMessage(Update update) {
-        if (update.hasMessage()) return update.getMessage();
-        if (update.hasChannelPost()) return update.getChannelPost();
-        return null;
-    }
-
-    private boolean isSupportedChatType(String type) {
-        return type != null && SUPPORTED_CHAT_TYPES.contains(type);
-    }
-
-    // ---------------------------
-    // Authorization
-    // ---------------------------
-
-    private boolean isAuthorized(Message message, Chat chat) {
-        if (!(telegramProperties.getEnableAllowUserIDs()
-                || telegramProperties.getEnableAllowChannelIDs())) {
-            return true;
-        }
-
-        return switch (chat.getType()) {
-            case CHAT_CHANNEL -> checkChannelAccess(message, chat);
-            case CHAT_PRIVATE -> checkUserAccess(message, chat);
-            case CHAT_GROUP, CHAT_SUPERGROUP -> true; // groups allowed by default
-            default -> false;
-        };
-    }
-
-    private boolean checkUserAccess(Message message, Chat chat) {
-        if (!telegramProperties.getEnableAllowUserIDs()) return true;
-
-        User from = message.getFrom();
-        List<Long> allow = telegramProperties.getAllowUserIDs();
-
-        if (allow.isEmpty()) {
-            log.warn("No allowed user IDs configured - allowing all users.");
-            return true;
-        }
-
-        if (from == null || !allow.contains(from.getId())) {
-            log.info(
-                    "Rejecting user {} in private chat {}",
-                    from != null ? from.getId() : "unknown",
-                    chat.getId());
-            if (feedback(FeedbackEnum.ERROR_MESSAGE, chat.getType())) {
-                sendMessage(chat.getId(), "You are not authorized to use this bot.");
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    private boolean checkChannelAccess(Message message, Chat chat) {
-        if (!telegramProperties.getEnableAllowChannelIDs()) return true;
-
-        Chat senderChat = message.getSenderChat();
-        List<Long> allow = telegramProperties.getAllowChannelIDs();
-
-        if (allow.isEmpty()) {
-            log.warn("No allowed channel IDs configured - allowing all channels.");
-            return true;
-        }
-
-        if (senderChat == null || !allow.contains(senderChat.getId())) {
-            log.info(
-                    "Rejecting channel {} in chat {}",
-                    senderChat != null ? senderChat.getId() : "unknown",
-                    chat.getId());
-            if (feedback(FeedbackEnum.ERROR_MESSAGE, chat.getType())) {
-                sendMessage(chat.getId(), "This channel is not authorized to use this bot.");
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    // ---------------------------
-    // File Handling
-    // ---------------------------
-
-    private void handleIncomingFile(Message message) {
-        Long chatId = message.getChatId();
-        Document doc = message.getDocument();
-        String chatType = message.getChat().getType();
-
-        if (doc == null) {
-            if (feedback(FeedbackEnum.NO_VALID_DOCUMENT, chatType)) {
-                sendMessage(chatId, "No document found.");
-            }
-            return;
-        }
-
-        if (doc.getMimeType() != null
-                && !ALLOWED_MIME_TYPES.contains(doc.getMimeType().toLowerCase())) {
-            if (feedback(FeedbackEnum.NO_VALID_DOCUMENT, chatType)) {
-                sendMessage(
-                        chatId,
-                        "Unsupported MIME type: "
-                                + doc.getMimeType()
-                                + "\nAllowed: "
-                                + String.join(", ", ALLOWED_MIME_TYPES));
-            }
-            return;
-        }
-
-        if (!hasJsonConfig(chatId)) {
-            if (feedback(FeedbackEnum.ERROR_PROCESSING, chatType)) {
-                sendMessage(
-                        chatId,
-                        "No JSON configuration file found in the pipeline inbox folder. Please"
-                                + " contact the administrator.");
-            }
-            return;
-        }
-
-        try {
-            if (!CHAT_CHANNEL.equalsIgnoreCase(chatType)
-                    && feedback(FeedbackEnum.PROCESSING, chatType)) {
-                sendMessage(chatId, "File received. Starting processing...");
-            }
-
-            PipelineFileInfo info = downloadMessageFile(message);
-            List<Path> outputs = waitForPipelineOutputs(info);
-
-            if (outputs.isEmpty()) {
-                if (feedback(FeedbackEnum.ERROR_PROCESSING, chatType)) {
-                    sendMessage(
-                            chatId,
-                            "No results were found in the pipeline output folder. Check"
-                                    + " configuration.");
-                }
-                return;
-            }
-
-            for (Path file : outputs) {
-                SendDocument out = new SendDocument();
-                out.setChatId(chatId);
-                out.setDocument(new InputFile(file.toFile(), file.getFileName().toString()));
-                execute(out);
-            }
-
-        } catch (TelegramApiException e) {
-            log.error("Telegram API error", e);
-            if (feedback(FeedbackEnum.ERROR_MESSAGE, chatType)) {
-                sendMessage(chatId, "Telegram API error occurred.");
-            }
-        } catch (IOException e) {
-            log.error("IO error", e);
-            if (feedback(FeedbackEnum.ERROR_MESSAGE, chatType)) {
-                sendMessage(chatId, "An IO error occurred.");
-            }
-        } catch (Exception e) {
-            log.error("Unexpected error", e);
-            if (feedback(FeedbackEnum.ERROR_MESSAGE, chatType)) {
-                sendMessage(chatId, "Unexpected error occurred.");
-            }
-        }
-    }
-
-    private PipelineFileInfo downloadMessageFile(Message message)
-            throws TelegramApiException, IOException {
-        Document document = message.getDocument();
-        String filename = document.getFileName();
-        String name =
-                StringUtils.isNotBlank(filename) ? filename : document.getFileUniqueId() + ".bin";
-
-        return downloadFile(document.getFileId(), name, message);
-    }
-
-    private PipelineFileInfo downloadFile(String fileId, String originalName, Message message)
-            throws TelegramApiException, IOException {
-
-        Long chatId = message.getChatId();
-
-        Path inboxFolder = getInboxFolder(chatId);
-
-        GetFile getFile = new GetFile(fileId);
-        File tgFile = execute(getFile);
-
-        if (tgFile == null || StringUtils.isBlank(tgFile.getFilePath())) {
-            throw new IOException("Telegram did not return a file path.");
-        }
-
-        URL url = buildDownloadUrl(tgFile.getFilePath());
-
-        String base = FilenameUtils.getBaseName(originalName) + "-" + UUID.randomUUID();
-        String ext = FilenameUtils.getExtension(originalName);
-        String outFile = ext.isBlank() ? base : base + "." + ext;
-
-        Path targetFile = inboxFolder.resolve(outFile);
-
-        try (InputStream in = url.openStream()) {
-            Files.copy(in, targetFile);
-        }
-
-        log.info("Saved Telegram file {} to {}", originalName, targetFile);
-        return new PipelineFileInfo(targetFile, base, Instant.now());
-    }
-
-    private URL buildDownloadUrl(String filePath) throws MalformedURLException {
-        try {
-            URI uri =
-                    new URI(
-                            "https",
-                            "api.telegram.org",
-                            "/file/bot" + this.telegramProperties.getBotToken() + "/" + filePath,
-                            null);
-            return uri.toURL();
-        } catch (URISyntaxException e) {
-            throw new MalformedURLException("Failed to build Telegram download URL");
-        } catch (MalformedURLException e) {
-            MalformedURLException sanitized =
-                    new MalformedURLException("Failed to build Telegram download URL");
-            sanitized.initCause(e);
-            throw sanitized;
-        }
-    }
-
-    // ---------------------------
-    // Inbox-Ordner & JSON-Check
-    // ---------------------------
-
-    private Path getInboxFolder(Long chatId) throws IOException {
-        Path baseInbox =
-                Paths.get(
-                        runtimePathConfig.getPipelineWatchedFoldersPath(),
-                        telegramProperties.getPipelineInboxFolder());
-
-        Files.createDirectories(baseInbox);
-
-        Path inboxFolder =
-                telegramProperties.getCustomFolderSuffix()
-                        ? baseInbox.resolve(chatId.toString())
-                        : baseInbox;
-
-        Files.createDirectories(inboxFolder);
-
-        return inboxFolder;
-    }
-
-    private boolean hasJsonConfig(Long chatId) {
-        try {
-            Path inboxFolder = getInboxFolder(chatId);
-            try (Stream<Path> s = Files.list(inboxFolder)) {
-                return s.anyMatch(p -> p.toString().endsWith(".json"));
-            }
-        } catch (IOException e) {
-            log.error("Failed to check JSON config for chat {}", chatId, e);
-            return false;
-        }
-    }
-
-    // ---------------------------
-    // Pipeline polling
-    // ---------------------------
-
-    private List<Path> waitForPipelineOutputs(PipelineFileInfo info) throws IOException {
-
-        Path finishedDir = Paths.get(runtimePathConfig.getPipelineFinishedFoldersPath());
-        Files.createDirectories(finishedDir);
-
-        Instant start = info.savedAt();
-        Duration timeout = Duration.ofSeconds(telegramProperties.getProcessingTimeoutSeconds());
-        Duration poll = Duration.ofMillis(telegramProperties.getPollingIntervalMillis());
-        List<Path> results = new ArrayList<>();
-
-        while (Duration.between(start, Instant.now()).compareTo(timeout) <= 0) {
-            try (Stream<Path> s = Files.list(finishedDir)) {
-                results =
-                        s.filter(Files::isRegularFile)
-                                .filter(path -> matchesBaseName(info.uniqueBaseName(), path))
-                                .filter(path -> isNewerThan(path, start))
-                                .sorted(Comparator.comparing(Path::toString))
-                                .toList();
-            }
-
-            if (!results.isEmpty()) {
-                break;
-            }
-
-            synchronized (pipelinePollMonitor) {
-                try {
-                    pipelinePollMonitor.wait(poll.toMillis());
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    break;
-                }
-            }
-        }
-
-        return results;
-    }
-
-    private boolean matchesBaseName(String base, Path file) {
-        return file.getFileName().toString().contains(base);
-    }
-
-    private boolean isNewerThan(Path path, Instant since) {
-        try {
-            return Files.getLastModifiedTime(path).toInstant().isAfter(since);
-        } catch (IOException e) {
-            log.info("Could not read modification time for {}", path);
-            return false;
-        }
-    }
-
-    // ---------------------------
-    // Messaging
-    // ---------------------------
-
-    private void sendMessage(Long chatId, String text) {
-        if (chatId == null) return;
-
-        SendMessage msg = new SendMessage();
-        msg.setChatId(chatId);
-        msg.setText(text);
-        try {
-            execute(msg);
-        } catch (TelegramApiException e) {
-            log.warn("Failed to send message to {}", chatId, e);
-        }
-    }
-
-    private record PipelineFileInfo(Path originalFile, String uniqueBaseName, Instant savedAt) {}
-
-    @Override
-    public String getBotUsername() {
-        return telegramProperties.getBotUsername();
-    }
-}

app/core/src/main/java/stirling/software/SPDF/utils/SvgOverlayUtil.java

@@ -1,97 +0,0 @@
-package stirling.software.SPDF.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.DocumentLoader;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.XMLResourceDescriptor;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.apache.pdfbox.util.Matrix;
-import org.w3c.dom.svg.SVGDocument;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-import de.rototor.pdfbox.graphics2d.PdfBoxGraphics2D;
-
-@UtilityClass
-@Slf4j
-public class SvgOverlayUtil {
-
-    public void overlaySvgOnPage(
-            PDDocument document, PDPage page, byte[] svgBytes, float x, float y)
-            throws IOException {
-        try {
-            String parser = XMLResourceDescriptor.getXMLParserClassName();
-            SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(parser);
-
-            SVGDocument svgDoc;
-            try (ByteArrayInputStream inputStream = new ByteArrayInputStream(svgBytes)) {
-                svgDoc = factory.createSVGDocument("file:///overlay.svg", inputStream);
-            }
-
-            UserAgent userAgent = new UserAgentAdapter();
-            DocumentLoader loader = new DocumentLoader(userAgent);
-            BridgeContext ctx = new BridgeContext(userAgent, loader);
-            ctx.setDynamicState(BridgeContext.DYNAMIC);
-
-            GVTBuilder builder = new GVTBuilder();
-            GraphicsNode rootNode = builder.build(ctx, svgDoc);
-
-            float svgWidth = (float) ctx.getDocumentSize().getWidth();
-            float svgHeight = (float) ctx.getDocumentSize().getHeight();
-
-            PdfBoxGraphics2D pdfGraphics = new PdfBoxGraphics2D(document, svgWidth, svgHeight);
-
-            try {
-                rootNode.paint(pdfGraphics);
-            } finally {
-                pdfGraphics.dispose();
-            }
-
-            PDFormXObject xform = pdfGraphics.getXFormObject();
-
-            try (PDPageContentStream newContentStream =
-                    new PDPageContentStream(
-                            document, page, PDPageContentStream.AppendMode.APPEND, true, true)) {
-                newContentStream.saveGraphicsState();
-
-                newContentStream.transform(new Matrix(1, 0, 0, 1, x, y));
-
-                newContentStream.drawForm(xform);
-
-                newContentStream.restoreGraphicsState();
-            }
-
-            log.info("SVG successfully overlaid as vector graphic at ({}, {})", x, y);
-
-        } catch (Exception e) {
-            log.error("Failed to overlay SVG as vector graphic", e);
-            throw new IOException("SVG overlay failed: " + e.getMessage(), e);
-        }
-    }
-
-    public boolean isSvgImage(byte[] bytes) {
-        if (bytes == null || bytes.length < 5) {
-            return false;
-        }
-        // Check for SVG markers: <?xml or <svg
-        String start =
-                new String(
-                                bytes,
-                                0,
-                                Math.min(200, bytes.length),
-                                java.nio.charset.StandardCharsets.UTF_8)
-                        .toLowerCase();
-        return start.contains("<svg") || (start.contains("<?xml") && start.contains("svg"));
-    }
-}

app/core/src/main/java/stirling/software/SPDF/utils/SvgToPdf.java

@@ -1,234 +0,0 @@
-package stirling.software.SPDF.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.DocumentLoader;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgent;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.XMLResourceDescriptor;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.w3c.dom.svg.SVGDocument;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-import de.rototor.pdfbox.graphics2d.PdfBoxGraphics2D;
-
-@UtilityClass
-@Slf4j
-public class SvgToPdf {
-
-    /** Default page width in points (A4) */
-    private static final float DEFAULT_PAGE_WIDTH = 595f;
-
-    /** Default page height in points (A4) */
-    private static final float DEFAULT_PAGE_HEIGHT = 842f;
-
-    /** Timeout for SVG rendering in seconds (prevents DoS via complex SVGs) */
-    private static final int RENDERING_TIMEOUT_SECONDS = 30;
-
-    public byte[] convert(byte[] svgBytes) throws IOException {
-        if (svgBytes == null || svgBytes.length == 0) {
-            throw new IOException("SVG input is empty or null");
-        }
-
-        log.debug("Starting SVG to PDF conversion, input size: {} bytes", svgBytes.length);
-
-        try {
-            // 1. Load SVG using Batik
-            String parser = XMLResourceDescriptor.getXMLParserClassName();
-            SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(parser);
-
-            SVGDocument svgDoc;
-            try (ByteArrayInputStream inputStream = new ByteArrayInputStream(svgBytes)) {
-                svgDoc = factory.createSVGDocument("file:///input.svg", inputStream);
-            }
-
-            // 2. Build the GVT (Graphics Vector Tree) with timeout protection
-            UserAgent userAgent = new UserAgentAdapter();
-            DocumentLoader loader = new DocumentLoader(userAgent);
-            BridgeContext ctx = new BridgeContext(userAgent, loader);
-            ctx.setDynamicState(BridgeContext.DYNAMIC);
-
-            GraphicsNode rootNode = buildGvtWithTimeout(ctx, svgDoc);
-
-            // 3. Get SVG dimensions
-            float width = (float) ctx.getDocumentSize().getWidth();
-            float height = (float) ctx.getDocumentSize().getHeight();
-
-            if (width <= 0) {
-                width = DEFAULT_PAGE_WIDTH;
-                log.warn("SVG width not specified, using default: {}", width);
-            }
-            if (height <= 0) {
-                height = DEFAULT_PAGE_HEIGHT;
-                log.warn("SVG height not specified, using default: {}", height);
-            }
-
-            log.debug("SVG dimensions: {}x{} points", width, height);
-
-            // 4. Create PDF document and render
-            return renderToPdf(rootNode, width, height);
-
-        } catch (Exception e) {
-            log.error("Failed to convert SVG to PDF", e);
-            throw new IOException("SVG to PDF conversion failed: " + e.getMessage(), e);
-        }
-    }
-
-    private GraphicsNode buildGvtWithTimeout(BridgeContext ctx, SVGDocument svgDoc)
-            throws IOException {
-        GVTBuilder builder = new GVTBuilder();
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-
-        Callable<GraphicsNode> buildTask = () -> builder.build(ctx, svgDoc);
-        Future<GraphicsNode> future = executor.submit(buildTask);
-
-        try {
-            return future.get(RENDERING_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-        } catch (TimeoutException e) {
-            future.cancel(true);
-            throw new IOException(
-                    "SVG rendering timed out after "
-                            + RENDERING_TIMEOUT_SECONDS
-                            + " seconds. The SVG may be too complex.");
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("SVG rendering was interrupted", e);
-        } catch (ExecutionException e) {
-            Throwable cause = e.getCause();
-            throw new IOException(
-                    "SVG rendering failed: "
-                            + (cause != null ? cause.getMessage() : e.getMessage()),
-                    cause);
-        } finally {
-            executor.shutdownNow();
-        }
-    }
-
-    private byte[] renderToPdf(GraphicsNode rootNode, float width, float height)
-            throws IOException {
-        try (PDDocument document = new PDDocument();
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
-            PDPage page = new PDPage(new PDRectangle(width, height));
-            document.addPage(page);
-
-            // Create and use PdfBoxGraphics2D with proper resource management
-            PdfBoxGraphics2D pdfGraphics = new PdfBoxGraphics2D(document, width, height);
-            try {
-                rootNode.paint(pdfGraphics);
-            } finally {
-                pdfGraphics.dispose();
-            }
-
-            PDFormXObject xform = pdfGraphics.getXFormObject();
-            try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
-                contentStream.drawForm(xform);
-            }
-
-            document.save(outputStream);
-
-            byte[] result = outputStream.toByteArray();
-            log.debug("SVG to PDF conversion complete, output size: {} bytes", result.length);
-
-            return result;
-        }
-    }
-
-    public byte[] combineIntoPdf(List<byte[]> svgBytesList) throws IOException {
-        if (svgBytesList == null || svgBytesList.isEmpty()) {
-            throw new IOException("SVG list is empty or null");
-        }
-
-        log.debug("Combining {} SVG files into single PDF", svgBytesList.size());
-
-        try (PDDocument document = new PDDocument();
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
-            for (int i = 0; i < svgBytesList.size(); i++) {
-                byte[] svgBytes = svgBytesList.get(i);
-                if (svgBytes == null || svgBytes.length == 0) {
-                    log.warn("Skipping empty SVG at index {}", i);
-                    continue;
-                }
-
-                try {
-                    addSvgAsPage(document, svgBytes);
-                    log.debug("Added SVG {} of {} to combined PDF", i + 1, svgBytesList.size());
-                } catch (Exception e) {
-                    log.error("Failed to add SVG {} to combined PDF: {}", i, e.getMessage());
-                    // Continue with other SVGs
-                }
-            }
-
-            if (document.getNumberOfPages() == 0) {
-                throw new IOException("No SVG files were successfully added to the PDF");
-            }
-
-            document.save(outputStream);
-            byte[] result = outputStream.toByteArray();
-            log.debug(
-                    "Combined SVG to PDF conversion complete, output size: {} bytes",
-                    result.length);
-            return result;
-        }
-    }
-
-    private void addSvgAsPage(PDDocument document, byte[] svgBytes) throws IOException {
-        String parser = XMLResourceDescriptor.getXMLParserClassName();
-        SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory(parser);
-
-        SVGDocument svgDoc;
-        try (ByteArrayInputStream inputStream = new ByteArrayInputStream(svgBytes)) {
-            svgDoc = factory.createSVGDocument("file:///input.svg", inputStream);
-        }
-
-        UserAgent userAgent = new UserAgentAdapter();
-        DocumentLoader loader = new DocumentLoader(userAgent);
-        BridgeContext ctx = new BridgeContext(userAgent, loader);
-        ctx.setDynamicState(BridgeContext.DYNAMIC);
-
-        GraphicsNode rootNode = buildGvtWithTimeout(ctx, svgDoc);
-
-        float svgWidth = (float) ctx.getDocumentSize().getWidth();
-        float svgHeight = (float) ctx.getDocumentSize().getHeight();
-
-        if (svgWidth <= 0) svgWidth = DEFAULT_PAGE_WIDTH;
-        if (svgHeight <= 0) svgHeight = DEFAULT_PAGE_HEIGHT;
-
-        // Use SVG dimensions directly for the PDF page
-        PDPage page = new PDPage(new PDRectangle(svgWidth, svgHeight));
-        document.addPage(page);
-
-        PdfBoxGraphics2D pdfGraphics = new PdfBoxGraphics2D(document, svgWidth, svgHeight);
-        try {
-            rootNode.paint(pdfGraphics);
-        } finally {
-            pdfGraphics.dispose();
-        }
-
-        PDFormXObject xform = pdfGraphics.getXFormObject();
-        try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
-            contentStream.drawForm(xform);
-        }
-    }
-}

app/core/src/main/resources/application.properties

@@ -33,6 +33,7 @@ server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true
 spring.devtools.restart.exclude=stirling.software.proprietary.security/**
+# spring.thymeleaf.encoding=UTF-8 # Disabled - React frontend replaces Thymeleaf
 spring.web.resources.mime-mappings.webmanifest=application/manifest+json
 spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}