Configure allowed endpoints in Harden Runner

Added allowed endpoints for Harden Runner step.
2026-01-15 20:03:24 +00:00
400 changed files with 21047 additions and 15397 deletions
@@ -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/**/.*'
@@ -116,7 +116,7 @@ jobs:
          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 +172,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 }}
@@ -362,7 +362,7 @@ jobs:
          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]'
@@ -45,7 +45,7 @@ jobs:
          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]'
@@ -133,7 +133,7 @@ jobs:
          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 +145,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 +153,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,11 +163,8 @@ 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
@@ -375,7 +367,7 @@ jobs:
          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
@@ -26,7 +26,7 @@ jobs:
          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]'
@@ -23,7 +23,7 @@ jobs:
        with:
          egress-policy: audit

-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          fetch-depth: 0

@@ -20,7 +20,7 @@ jobs:
        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
@@ -36,7 +36,7 @@ jobs:
        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
@@ -60,7 +60,7 @@ jobs:
        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
@@ -135,7 +127,7 @@ jobs:
          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 +135,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
@@ -172,7 +156,7 @@ jobs:
        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:
@@ -207,7 +191,7 @@ jobs:
          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 +199,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()
@@ -261,7 +236,7 @@ jobs:
          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,11 +244,6 @@ 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

@@ -299,10 +269,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'
@@ -325,7 +291,7 @@ jobs:
          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,17 +306,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: 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

@@ -32,7 +32,7 @@ jobs:
          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
@@ -22,7 +22,7 @@ jobs:
          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:
@@ -30,7 +30,7 @@ jobs:
          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
@@ -54,7 +54,7 @@ jobs:
          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
@@ -317,7 +317,7 @@ jobs:
          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

@@ -20,7 +20,7 @@ jobs:
          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
@@ -42,7 +42,7 @@ jobs:
        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 +50,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 +62,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
@@ -115,7 +110,7 @@ jobs:
        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 +118,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 +131,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

@@ -174,9 +165,12 @@ jobs:
        uses: step-security/harden-runner@20cf305ff2072d973412fa9b1e3a4f227bda3c76 # v2.14.0
        with:
          egress-policy: audit
-
+          allowed-endpoints: >
+            one.digicert.com:443
+            clientauth.one.digicert.com:443
+      
      - 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'
@@ -203,18 +197,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,9 +267,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
@@ -552,25 +538,25 @@ jobs:
          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
@@ -26,7 +26,7 @@ jobs:
          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: |
@@ -37,7 +37,7 @@ jobs:
        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,8 +45,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

@@ -57,16 +56,6 @@ jobs:
      - 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'
@@ -40,7 +40,7 @@ jobs:
          egress-policy: audit

      - name: "Checkout code"
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          persist-credentials: false

@@ -31,7 +31,7 @@ jobs:
        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: |
@@ -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"
@@ -39,7 +36,7 @@ jobs:
        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
@@ -72,7 +72,7 @@ jobs:
          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'
@@ -99,19 +99,14 @@ 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..."
-          # 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 +170,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
@@ -30,7 +30,7 @@ jobs:
          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,11 +44,8 @@ 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
@@ -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
@@ -147,7 +144,7 @@ jobs:
        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
@@ -213,7 +213,7 @@ id_ed25519.pub
 .mypy_cache
 .pytest_cache
 .ipynb_checkpoints
-.build-cache
+


 **/jcef-bundle/
@@ -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
@@ -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)
@@ -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.
@@ -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,8 +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"
+    api 'org.snakeyaml:snakeyaml-engine:2.10'
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.14"
    // 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
@@ -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();
@@ -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;
+    }
+}
+*/
@@ -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;
    }

@@ -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;
+    }
+}
+*/
@@ -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
@@ -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");
@@ -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;
-    }
-}
@@ -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());
+    }
+}
+*/
@@ -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));
@@ -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')) {
@@ -51,7 +63,7 @@ dependencies {
    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.1'
    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 +91,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 +117,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/**'
+            }
+        }
    }

 }
@@ -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();
@@ -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 =
@@ -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.")
@@ -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 =
@@ -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 =
@@ -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;
@@ -49,4 +52,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.");
+    }
 }
@@ -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 =
@@ -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 =
@@ -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 =
@@ -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 =
@@ -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() {
@@ -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 =
@@ -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 =
@@ -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;
-        }
-    }
-}
@@ -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 =
@@ -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 =
@@ -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")
@@ -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 =
@@ -112,16 +112,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();
@@ -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 =
@@ -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);
@@ -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();
@@ -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);
        }
@@ -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;
-        }
-    }
 }
@@ -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);
@@ -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) {

@@ -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";
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -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: /";
+        }
+    }
+}
@@ -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";
+    }
+}
@@ -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";
+    }
+}
@@ -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();
-    }
 }
@@ -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;
 }
@@ -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;
-}
@@ -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;
@@ -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);
@@ -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(
@@ -82,7 +82,7 @@ public class TelegramPipelineBot extends TelegramLongPollingBot {

    @PostConstruct
    public void register() {
-        if (StringUtils.isAnyBlank(getBotUsername(), this.telegramProperties.getBotToken())) {
+        if (StringUtils.isAnyBlank(getBotUsername(), getBotToken())) {
            log.warn("Telegram bot disabled because botToken or botUsername is not configured");
            return;
        }
@@ -392,7 +392,7 @@ public class TelegramPipelineBot extends TelegramLongPollingBot {
                    new URI(
                            "https",
                            "api.telegram.org",
-                            "/file/bot" + this.telegramProperties.getBotToken() + "/" + filePath,
+                            "/file/bot" + getBotToken() + "/" + filePath,
                            null);
            return uri.toURL();
        } catch (URISyntaxException e) {
@@ -516,4 +516,9 @@ public class TelegramPipelineBot extends TelegramLongPollingBot {
    public String getBotUsername() {
        return telegramProperties.getBotUsername();
    }
+
+    @Override
+    public String getBotToken() {
+        return telegramProperties.getBotToken();
+    }
 }
@@ -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"));
-    }
-}
@@ -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);
-        }
-    }
-}
@@ -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}

@@ -0,0 +1,21 @@
+<!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='<3')}"></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>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,479 @@
+<!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=#{account.title})}"></th:block>
+    <link rel="stylesheet" th:href="@{/css/modern-tables.css}">
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <div id="page-container">
+      <div id="content-wrap">
+        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+        
+        <div class="data-container">
+          <div class="data-panel">
+            <div class="data-header">
+              <h1 class="data-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">settings_account_box</span>
+                </span>
+                <span th:text="#{account.accountSettings}">User Settings</span>
+              </h1>
+            </div>
+            
+            <div class="data-body">
+              <div th:if="${messageType}" class="alert alert-danger data-mb-3">
+                <span th:text="#{${messageType}}">Default message if not found</span>
+              </div>
+              
+              <div th:if="${error}" class="alert alert-danger data-mb-3" role="alert">
+                <span th:text="${error}">Error Message</span>
+              </div>
+              
+              <!-- Admin Settings Banner (for admins only) -->
+              <div th:if="${role == 'ROLE_ADMIN'}" class="data-panel data-mb-3" style="background-color: var(--md-sys-color-secondary-container);">
+				  <div class="data-body" style="display: flex; align-items: center; justify-content: space-between; padding: 1rem 1.5rem; background-color: var(--md-sys-color-secondary-container);">
+				    <div style="display: flex; align-items: center; gap: 1rem;">
+				      <span class="material-symbols-rounded" style="font-size: 2rem; color: var(--md-sys-color-secondary);">
+				        admin_panel_settings
+				      </span>
+				      <div>
+				        <h4 style="margin: 0; color: var(--md-sys-color-secondary);" th:text="#{account.adminTitle}">Administrator Tools</h4>
+				        <p style="margin: 0.25rem 0 0 0; color: var(--md-sys-color-secondary);" th:text="#{account.adminNotif}">You have admin privileges. Access system settings and user management.</p>
+				      </div>
+				    </div>
+				    <a class="data-btn" th:href="@{'/adminSettings'}" role="button" target="_blank"
+				       style="background-color: var(--md-sys-color-secondary); color: var(--md-sys-color-on-secondary); display: inline-flex; align-items: center; gap: 0.5rem; padding: 0.625rem 1.25rem; border-radius: 0.5rem; font-weight: 500; border: none; cursor: pointer; text-decoration: none;">
+				      <span class="material-symbols-rounded">admin_panel_settings</span>
+				      <span th:text="#{account.adminSettings}">Admin Settings</span>
+				    </a>
+				  </div>
+				</div>
+				
+              <!-- Account Management Buttons -->
+              <th:block th:if="not ${oAuth2Login} or not ${saml2Login}">
+                <div class="data-section-title">Account Management</div>
+                <div class="data-actions data-actions-start data-mb-3">
+                  <button class="data-btn data-btn-primary" data-bs-toggle="modal" data-bs-target="#changeUsernameModal">
+                    <span class="material-symbols-rounded">edit</span>
+                    <span th:text="#{account.changeUsername}">Change Username</span>
+                  </button>
+                  <button class="data-btn data-btn-primary" data-bs-toggle="modal" data-bs-target="#changePasswordModal">
+                    <span class="material-symbols-rounded">key</span>
+                    <span th:text="#{account.changePassword}">Change Password</span>
+                  </button>
+                </div>
+              </th:block>
+
+              <!-- API Key Section -->
+              <div class="data-section-title" th:text="#{account.yourApiKey}">API Key</div>
+              <div class="data-panel data-mb-3">
+                <div class="data-header">
+                  <h5 class="data-title">
+                    <span class="data-icon">
+                      <span class="material-symbols-rounded">key</span>
+                    </span>
+                    <span th:text="#{account.yourApiKey}">API Key</span>
+                  </h5>
+                </div>
+                <div class="data-body">
+                  <div style="display: flex; gap: 0.5rem;">
+                    <input class="data-form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly style="flex: 1;">
+                    <button class="data-btn data-btn-secondary" id="copyBtn" type="button" onclick="copyToClipboard()" title="Copy to clipboard">
+                      <span class="material-symbols-rounded">content_copy</span>
+                    </button>
+                    <button class="data-btn data-btn-secondary" id="showBtn" type="button" onclick="showApiKey()" title="Show/hide API key">
+                      <span class="material-symbols-rounded" id="eyeIcon">visibility</span>
+                    </button>
+                    <button class="data-btn data-btn-secondary" id="refreshBtn" type="button" onclick="refreshApiKey()" title="Refresh API key">
+                      <span class="material-symbols-rounded">refresh</span>
+                    </button>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Settings Sync Section -->
+              <div class="data-section-title" th:text="#{account.syncTitle}">Sync browser settings with Account</div>
+              <div class="data-panel data-mb-3">
+                <div class="data-header">
+                  <h5 class="data-title">
+                    <span class="data-icon">
+                      <span class="material-symbols-rounded">sync</span>
+                    </span>
+                    <span th:text="#{account.settingsCompare}">Settings Comparison</span>
+                  </h5>
+                </div>
+                <div class="data-body">
+                  <div class="table-responsive">
+                    <table id="settingsTable" class="data-table">
+                      <thead>
+                        <tr>
+                          <th scope="col" th:text="#{account.property}">Property</th>
+                          <th scope="col" th:text="#{account.accountSettings}">Account Setting</th>
+                          <th scope="col" th:text="#{account.webBrowserSettings}">Web Browser Setting</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <!-- This will be dynamically populated by JavaScript -->
+                      </tbody>
+                    </table>
+                  </div>
+                  
+                  <div class="data-actions data-mt-3">
+                    <button id="syncToBrowser" class="data-btn data-btn-primary">
+                      <span class="material-symbols-rounded">cloud_download</span>
+                      <span th:text="#{account.syncToBrowser}">Sync Account -> Browser</span>
+                    </button>
+                    <button id="syncToAccount" class="data-btn data-btn-secondary">
+                      <span class="material-symbols-rounded">cloud_upload</span>
+                      <span th:text="#{account.syncToAccount}">Sync Account <- Browser</span>
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- Change Username Modal -->
+      <div class="modal fade" id="changeUsernameModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsavechangeusername" th:action="@{'/api/v1/user/change-username'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">edit</span>
+                </span>
+                <span th:text="#{account.changeUsername}">Change Username</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="newUsername" class="data-form-label" th:text="#{account.newUsername}">New Username</label>
+                <input type="text" class="data-form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
+                <span id="usernameError" style="display: none; color: var(--md-sys-color-error);" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+              </div>
+              <div class="data-form-group">
+                <label for="currentPasswordChangeUsername" class="data-form-label" th:text="#{password}">Password</label>
+                <input type="password" class="data-form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{account.changeUsername}">Change Username</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+      
+      <!-- Change Password Modal -->
+      <div class="modal fade" id="changePasswordModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsavechangepassword" th:action="@{'/api/v1/user/change-password'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">key</span>
+                </span>
+                <span th:text="#{account.changePassword}">Change Password</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="currentPassword" class="data-form-label" th:text="#{account.oldPassword}">Old Password</label>
+                <input type="password" class="data-form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
+              </div>
+              <div class="data-form-group">
+                <label for="newPassword" class="data-form-label" th:text="#{account.newPassword}">New Password</label>
+                <input type="password" class="data-form-control" name="newPassword" id="newPassword" th:placeholder="#{account.newPassword}">
+              </div>
+              <div class="data-form-group">
+                <label for="confirmNewPassword" class="data-form-label" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
+                <input type="password" class="data-form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
+                <span id="confirmPasswordError" style="display: none; color: var(--md-sys-color-error);" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{account.changePassword}">Change Password</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    
+    <!-- JavaScript for validation -->
+    <script th:inline="javascript">
+      jQuery.validator.addMethod("usernamePattern", function(value, element) {
+        // Regular expression for user name: Min. 3 characters, max. 50 characters
+        const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
+
+        // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
+        const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
+
+        // Check if the field is optional or meets the requirements
+        return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
+      }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
+      
+      $(document).ready(function() {
+        $.validator.addMethod("passwordMatch", function(value, element) {
+          return $('#newPassword').val() === $('#confirmNewPassword').val();
+        }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
+        
+        $('#formsavechangepassword').validate({
+          rules: {
+            currentPassword: {
+              required: true
+            },
+            newPassword: {
+              required: true
+            },
+            confirmNewPassword: {
+              required: true,
+              passwordMatch: true
+            }
+          },
+          errorPlacement: function(error, element) {
+            if (element.attr("name") === "newPassword" || element.attr("name") === "confirmNewPassword") {
+              $("#confirmPasswordError").text(error.text()).show();
+            } else {
+              error.insertAfter(element);
+            }
+          },
+          success: function(label, element) {
+            if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+              $("#confirmPasswordError").hide();
+            }
+          }
+        });
+
+        $('#formsavechangeusername').validate({
+          rules: {
+            newUsername: {
+              required: true,
+              usernamePattern: true
+            },
+            currentPasswordChangeUsername: {
+              required: true
+            }
+          },
+          messages: {
+            newUsername: {
+              usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
+            },
+          },
+          errorPlacement: function(error, element) {
+            if (element.attr("name") === "newUsername") {
+              $("#usernameError").text(error.text()).show();
+            } else {
+              error.insertAfter(element);
+            }
+          },
+          success: function(label, element) {
+            if ($(element).attr("name") === "newUsername") {
+              $("#usernameError").hide();
+            }
+          }
+        });
+      });
+    </script>
+
+    <!-- JavaScript for API Key -->
+    <script th:inline="javascript">
+      function copyToClipboard() {
+        const apiKeyElement = document.getElementById("apiKey");
+        apiKeyElement.select();
+        document.execCommand("copy");
+      }
+
+      function showApiKey() {
+        const apiKeyElement = document.getElementById("apiKey");
+        const copyBtn = document.getElementById("copyBtn");
+        const eyeIcon = document.getElementById("eyeIcon");
+        if (apiKeyElement.type === "password") {
+          apiKeyElement.type = "text";
+          eyeIcon.textContent = "visibility_off";
+          copyBtn.disabled = false;  // Enable copy button when API key is visible
+        } else {
+          apiKeyElement.type = "password";
+          eyeIcon.textContent = "visibility";
+          copyBtn.disabled = true;  // Disable copy button when API key is hidden
+        }
+      }
+
+      document.addEventListener("DOMContentLoaded", async function() {
+        try {
+          /*<![CDATA[*/
+          const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
+          /*]]>*/
+          let response = await window.fetchWithCsrf(urlGetApiKey, { method: 'POST' });
+          if (response.status === 200) {
+            let apiKey = await response.text();
+            manageUIState(apiKey);
+          } else {
+            manageUIState(null);
+          }
+        } catch (error) {
+          console.error('There was an error:', error);
+        }
+        finally {
+          showApiKey();
+        }
+      });
+
+      async function refreshApiKey() {
+        try {
+          /*<![CDATA[*/
+          const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
+          /*]]>*/
+          let response = await window.fetchWithCsrf(urlUpdateApiKey, { method: 'POST' });
+          if (response.status === 200) {
+            let apiKey = await response.text();
+            manageUIState(apiKey);
+            document.getElementById("apiKey").type = 'text';
+            document.getElementById("copyBtn").disabled = false;
+          } else {
+            alert('Error refreshing API key.');
+          }
+        } catch (error) {
+          console.error('There was an error:', error);
+        }
+      }
+
+      function manageUIState(apiKey) {
+        const apiKeyElement = document.getElementById("apiKey");
+        const showBtn = document.getElementById("showBtn");
+        const copyBtn = document.getElementById("copyBtn");
+
+        if (apiKey && apiKey.trim().length > 0) {
+          apiKeyElement.value = apiKey;
+          showBtn.disabled = false;
+          copyBtn.disabled = false;
+        } else {
+          apiKeyElement.value = "";
+          showBtn.disabled = true;
+          copyBtn.disabled = true;
+        }
+      }
+    </script>
+
+    <!-- JavaScript for Settings Sync -->
+   <script th:inline="javascript">
+	  document.addEventListener("DOMContentLoaded", async function() {
+	    const settingsTableBody = document.querySelector("#settingsTable tbody");
+	    
+	    // Helper function to check if a key should be ignored
+	    function shouldIgnoreKey(key) {
+	      return key === 'debug' || 
+	             key === '0' || 
+	             key === '1' || 
+	             key.includes('pdfjs') || 
+	             key.includes('clientSubmissionOrder') || 
+	             key.includes('lastSubmitTime') || 
+	             key.includes('lastClientId') || 
+	             key.includes('stirling_jwt') ||
+	             key.includes('JSESSIONID') ||
+	             key.includes('XSRF-TOKEN') ||
+	             key.includes('remember-me') ||
+	             key.includes('auth') ||
+	             key.includes('token') ||
+	             key.includes('session') ||
+	             key.includes('posthog') || key.includes('ssoRedirectAttempts') || key.includes('lastRedirectAttempt') || key.includes('surveyVersion') || 
+	             key.includes('pageViews');
+	    }
+	
+	    /*<![CDATA[*/
+	    var accountSettingsString = /*[[${settings}]]*/ {};
+	    /*]]>*/
+	    var accountSettings = JSON.parse(accountSettingsString);
+	
+	    let allKeys = new Set([...Object.keys(accountSettings), ...Object.keys(localStorage)]);
+	
+	    allKeys.forEach(key => {
+	      if(shouldIgnoreKey(key)) return;  // Using our helper function
+	
+	      const accountValue = accountSettings[key] || '-';
+	      const browserValue = localStorage.getItem(key) || '-';
+	
+	      const row = settingsTableBody.insertRow();
+	      const propertyCell = row.insertCell(0);
+	      const accountCell = row.insertCell(1);
+	      const browserCell = row.insertCell(2);
+	
+	      propertyCell.textContent = key;
+	      accountCell.textContent = accountValue;
+	      browserCell.textContent = browserValue;
+	    });
+	
+	    document.getElementById('syncToBrowser').addEventListener('click', function() {
+	      // First, clear the local storage
+	      localStorage.clear();
+	
+	      // Then, set the account settings to local storage
+	      for (let key in accountSettings) {
+	        if(!shouldIgnoreKey(key)) { // Using our helper function
+	          localStorage.setItem(key, accountSettings[key]);
+	        }
+	      }
+	      location.reload();  // Refresh the page after sync
+	    });
+	
+	    document.getElementById('syncToAccount').addEventListener('click', async function() {
+	      /*<![CDATA[*/
+	      const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
+	      /*]]>*/
+	
+	      let settings = {};
+	      for (let i = 0; i < localStorage.length; i++) {
+	        const key = localStorage.key(i);
+	        if(!shouldIgnoreKey(key)) { // Using our helper function
+	          settings[key] = localStorage.getItem(key);
+	        }
+	      }
+	
+	      try {
+	        const response = await window.fetchWithCsrf(urlUpdateUserSettings, {
+	          method: 'POST',
+	          headers: {
+	            'Content-Type': 'application/json',
+	          },
+	          body: JSON.stringify(settings)
+	        });
+	
+	        if (response.ok) {
+	          location.reload();
+	        } else {
+	          alert('Error syncing settings to account');
+	        }
+	      } catch (error) {
+	        console.error('Error:', error);
+	        alert('Error syncing settings to account');
+	      }
+	    });
+	  });
+	</script>
+              
+      
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,458 @@
+<!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=#{adminUserSettings.title}, header=#{adminUserSettings.header})}"></th:block>
+    <link rel="stylesheet" th:href="@{/css/modern-tables.css}">
+    <style>
+      .active-user {
+        color: var(--md-sys-color-tertiary);
+        font-weight: 600;
+      }
+    </style>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <div id="page-container">
+      <div id="content-wrap">
+        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+        
+        <div class="data-container">
+          <div class="data-panel">
+            <div class="data-header">
+              <h1 class="data-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">manage_accounts</span>
+                </span>
+                <span th:text="#{adminUserSettings.header}">Admin User Control Settings</span>
+              </h1>
+            </div>
+            
+            <div class="data-body">
+              <!-- User Stats Banner -->
+              <div class="data-panel data-mb-3" style="background-color: var(--md-sys-color-primary-container);">
+                <div class="data-body" style="padding: 1.25rem;">
+                  <div style="display: flex; flex-wrap: wrap; justify-content: space-around; align-items: center; gap: 1.5rem;">
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        group
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.totalUsers}">Total Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;">
+                          <span th:text="${totalUsers}"></span>
+                          <span th:if="${@runningProOrHigher}" th:text="'/' + ${maxPaidUsers}" style="font-size: 1rem;"></span>
+                        </div>
+                      </div>
+                    </div>
+                    
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        check_circle
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.activeUsers}">Active Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;" th:text="${activeUsers}"></div>
+                      </div>
+                    </div>
+                    
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        person_off
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.disabledUsers}">Disabled Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;" th:text="${disabledUsers}"></div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              
+              <!-- Alert Messages -->
+              <div th:if="${addMessage}" th:class="${#strings.contains(addMessage, 'Successfully') or #strings.contains(addMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
+                <span th:text="#{${addMessage}}">Default message if not found</span>
+              </div>
+              
+              <div th:if="${changeMessage}" th:class="${#strings.contains(changeMessage, 'Successfully') or #strings.contains(changeMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
+                <span th:text="#{${changeMessage}}">Default message if not found</span>
+              </div>
+              
+              <div th:if="${deleteMessage}" th:class="${#strings.contains(deleteMessage, 'Successfully') or #strings.contains(deleteMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
+                <span th:text="#{${deleteMessage}}">Default message if not found</span>
+              </div>
+              
+              <!-- Admin Actions -->
+              <div class="data-section-title">User Management</div>
+              <div class="data-actions data-mb-3">
+                <button 
+                  th:data-bs-toggle="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : 'modal'"
+                  th:data-bs-target="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : '#addUserModal'"
+                  th:class="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? 'data-btn data-btn-danger' : 'data-btn data-btn-primary'"
+                  th:title="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? #{adminUserSettings.maxUsersReached} : #{adminUserSettings.addUser}">
+                  <span class="material-symbols-rounded">person_add</span>
+                  <span th:text="#{adminUserSettings.addUser}">Add New User</span>
+                </button>
+
+                <a th:href="@{'/teams'}" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.teams}">
+                  <span class="material-symbols-rounded">group</span>
+                  <span th:text="#{adminUserSettings.teams}">Manage Teams</span>
+                </a>
+                
+                <button 
+                  data-bs-toggle="modal" 
+                  data-bs-target="#changeUserRoleModal" 
+                  class="data-btn data-btn-secondary" 
+                  th:title="#{adminUserSettings.changeUserRole}">
+                  <span class="material-symbols-rounded">edit</span>
+                  <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
+                </button>
+                
+                <a th:href="@{'/usage'}" th:if="${@runningEE}" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.usage}">
+                  <span class="material-symbols-rounded">analytics</span>
+                  <span th:text="#{adminUserSettings.usage}">Usage Statistics</span>
+                </a>
+                
+                <a href="/audit" th:if="${@runningEE}" class="data-btn data-btn-secondary" title="Audit Dashboard">
+                  <span class="material-symbols-rounded">security</span>
+                  <span>Audit Dashboard</span>
+                </a>
+              </div>
+              
+              <!-- Users Table -->
+              <div class="table-responsive">
+                <table class="data-table">
+                  <thead>
+                    <tr>
+                      <th scope="col">#</th>
+                      <th scope="col" th:title="#{username}" class="text-overflow" th:text="#{username}">Username</th>
+                      <th scope="col" th:title="#{adminUserSettings.team}" class="text-overflow" th:text="#{adminUserSettings.team}">Team</th>
+                      <th scope="col" th:title="#{adminUserSettings.role}" class="text-overflow" th:text="#{adminUserSettings.role}">Roles</th>
+                      <th scope="col" th:title="#{adminUserSettings.authenticated}" class="text-overflow" th:text="#{adminUserSettings.authenticated}">Authenticated</th>
+                      <th scope="col" th:title="#{adminUserSettings.lastRequest}" class="text-overflow" th:text="#{adminUserSettings.lastRequest}">Last Request</th>
+                      <th scope="col" th:title="#{adminUserSettings.actions}" class="text-overflow" th:text="#{adminUserSettings.actions}">Actions</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr th:each="user : ${users}">
+                      <td th:text="${user.id}" th:title="${user.id}" class="text-overflow"></td>
+                      <td th:text="${user.username}" th:title="${user.username}" class="text-overflow" th:classappend="${userSessions[user.username] ? 'active-user' : ''}"></td>
+                      <td th:text="${user.team != null ? user.team.name : '—'}" th:title="${user.team != null ? user.team.name : '—'}" class="text-overflow"></td>
+                      <td>
+                        <span class="data-badge" style="background-color: var(--md-sys-color-secondary-container); color: var(--md-sys-color-secondary); padding: 0.25rem 0.5rem; border-radius: 1rem; font-size: 0.875rem; display: inline-flex; align-items: center; gap: 0.25rem;">
+                          <span class="material-symbols-rounded" style="font-size: 1rem;">shield</span>
+                          <span th:text="#{${user.roleName}}" th:title="#{${user.roleName}}" class="text-overflow">Role</span>
+                        </span>
+                      </td>
+                      <td th:text="${user.authenticationType}" th:title="${user.authenticationType}"></td>
+                      <td th:text="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}" th:title="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}"></td>
+                      <td>
+                        <div class="data-action-cell">
+                          <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post" onsubmit="return confirmDeleteUser()" style="display: inline;">
+                            <button type="submit" th:title="#{adminUserSettings.deleteUser}" class="data-icon-btn data-icon-btn-danger">
+                              <span class="material-symbols-rounded">person_remove</span>
+                            </button>
+                          </form>
+                          
+                          <a th:if="${user.username == currentUsername}" th:title="#{adminUserSettings.editOwnProfil}" th:href="@{'/account'}" class="data-icon-btn data-icon-btn-primary">
+                            <span class="material-symbols-rounded">edit</span>
+                          </a>
+                          
+                          <form th:action="@{'/api/v1/user/admin/changeUserEnabled/' + ${user.username}}" method="post" onsubmit="return confirmChangeUserStatus()" style="display: inline;">
+                            <input type="hidden" name="enabled" th:value="!${user.enabled}" />
+                            <button type="submit" th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" class="data-icon-btn data-icon-btn-primary">
+                              <span class="material-symbols-rounded">person</span>
+                            </button>
+                            <button type="submit" th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" class="data-icon-btn data-icon-btn-danger">
+                              <span class="material-symbols-rounded">person_off</span>
+                            </button>
+                          </form>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              
+              <p th:if="${!@runningProOrHigher}" class="data-mt-3" th:text="#{enterpriseEdition.ssoAdvert}"></p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Change User Role Modal -->
+      <div class="modal fade" id="changeUserRoleModal" tabindex="-1" aria-labelledby="changeUserRoleModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form th:action="@{'/api/v1/user/admin/changeRole'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">edit</span>
+                </span>
+                <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-mb-2">
+                <button class="data-btn data-btn-secondary" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" style="padding: 0.25rem 0.5rem;">
+                  <span class="material-symbols-rounded">help</span>
+                  <span th:text="#{help}">Help</span>
+                </button>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="username" class="data-form-label" th:text="#{username}">Username</label>
+                <select name="username" id="username" class="data-form-control" required>
+                  <option value="" disabled selected th:text="#{selectFilter}">-- Select --</option>
+                  <option th:each="user : ${users}" th:if="${user.username != currentUsername}" th:value="${user.username}" th:text="${user.username}">Username</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="role" class="data-form-label" th:text="#{adminUserSettings.role}">Role</label>
+                <select name="role" id="role" class="data-form-control" required>
+                  <option value="" disabled selected th:text="#{selectFilter}">-- Select --</option>
+                  <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="team" class="data-form-label" th:text="#{adminUserSettings.team}">Team</label>
+                <select name="teamId" id="team" class="data-form-control" required>
+                  <option value="" th:text="#{selectFilter}">-- Select --</option>
+                  <option th:each="team : ${teams}" th:value="${team.id}" th:text="${team.name}"></option>
+                </select>
+              </div>
+              
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Save User</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+
+      <!-- Add User Modal -->
+      <div class="modal fade" id="addUserModal" tabindex="-1" style="z-index: 10000;" aria-labelledby="addUserModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">person_add</span>
+                </span>
+                <span th:text="#{adminUserSettings.addUser}">Add New User</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-mb-2">
+                <button class="data-btn data-btn-secondary" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" style="padding: 0.25rem 0.5rem;">
+                  <span class="material-symbols-rounded">help</span>
+                  <span th:text="#{help}">Help</span>
+                </button>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="username" class="data-form-label" th:text="#{username}">Username</label>
+                <input type="text" class="data-form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
+                <span id="usernameError" style="display: none; color: var(--md-sys-color-error);" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+              </div>
+              
+              <div class="data-form-group" id="passwordContainer">
+                <label for="password" class="data-form-label" th:text="#{password}">Password</label>
+                <input type="password" class="data-form-control" name="password" id="password" required>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="role" class="data-form-label" th:text="#{adminUserSettings.role}">Role</label>
+                <select name="role" class="data-form-control" id="role" required>
+                  <option value="" disabled selected th:text="#{selectFilter}">-- Select --</option>
+                  <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="team" class="data-form-label" th:text="#{adminUserSettings.team}">Team</label>
+                <select name="teamId" class="data-form-control" required>
+                  <option value="" th:text="#{selectFilter}">-- Select --</option>
+                  <option th:each="team : ${teams}" th:value="${team.id}" th:text="${team.name}"></option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="authType" class="data-form-label">Authentication Type</label>
+                <select id="authType" name="authType" class="data-form-control" required>
+                  <option value="web" selected>WEB</option>
+                  <option value="sso">SSO</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group" id="checkboxContainer">
+                <div class="form-check">
+                  <input id="forceChange" name="forceChange" type="checkbox">
+                  <label for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
+                </div>
+              </div>
+              
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Save User</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+
+      <!-- Add Team Modal -->
+      <div class="modal fade" id="addTeamModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form th:action="@{'/api/v1/team/create'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">group_add</span>
+                </span>
+                <span th:text="#{adminUserSettings.createTeam}">Create Team</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="teamName" class="data-form-label" th:text="#{adminUserSettings.teamName}">Team Name</label>
+                <input type="text" name="name" id="teamName" class="data-form-control" required />
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Create</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+
+      <script th:inline="javascript">
+        const delete_confirm_text = /*[[#{adminUserSettings.confirmDeleteUser}]]*/ 'Should the user be deleted?';
+        const change_confirm_text = /*[[#{adminUserSettings.confirmChangeUserStatus}]]*/ 'Should the user be disabled/enabled?';
+        
+        function confirmDeleteUser() {
+          return confirm(delete_confirm_text);
+        }
+        
+        function confirmChangeUserStatus() {
+          return confirm(change_confirm_text);
+        }
+        
+        jQuery.validator.addMethod("usernamePattern", function(value, element) {
+          // Regular expression for user name: Min. 3 characters, max. 50 characters
+          const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
+
+          // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
+          const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
+
+          // Check if the field is optional or meets the requirements
+          return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
+        }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
+        
+        $(document).ready(function() {
+          $('[data-toggle="tooltip"]').tooltip();
+
+          $('#formsaveuser').validate({
+            rules: {
+              username: {
+                required: true,
+                usernamePattern: true
+              },
+              password: {
+                required: true
+              },
+              role: {
+                required: true
+              },
+              authType: {
+                required: true
+              }
+            },
+            messages: {
+              username: {
+                usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
+              },
+            },
+            errorPlacement: function(error, element) {
+              if (element.attr("name") === "username") {
+                $("#usernameError").text(error.text()).show();
+              } else if (element.attr("name") !== "role" && element.attr("name") !== "authType") {
+                error.insertAfter(element);
+              }
+            },
+            success: function(label, element) {
+              if ($(element).attr("name") === "username") {
+                $("#usernameError").hide();
+              }
+            }
+          });
+
+          $('#username').on('input', function() {
+            var usernameInput = $(this);
+            var isValid = usernameInput[0].checkValidity();
+            var errorSpan = $('#usernameError');
+
+            if (isValid) {
+              usernameInput.removeClass('invalid').addClass('valid');
+              errorSpan.hide();
+            } else {
+              usernameInput.removeClass('valid').addClass('invalid');
+              errorSpan.show();
+            }
+          });
+
+          $('#authType').on('change', function() {
+            var authType = $(this).val();
+            var passwordField = $('#password');
+            var passwordFieldContainer = $('#passwordContainer');
+            var checkboxContainer = $('#checkboxContainer');
+
+            if (authType === 'sso') {
+              passwordField.removeAttr('required');
+              passwordField.prop('disabled', true).val('');
+              passwordFieldContainer.slideUp('fast');
+              checkboxContainer.slideUp('fast');
+            } else {
+              passwordField.prop('disabled', false);
+              passwordField.attr('required', 'required');
+              passwordFieldContainer.slideDown('fast');
+              checkboxContainer.slideDown('fast');
+            }
+          });
+        });
+      </script>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,62 @@
+<!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=#{autoSplitPDF.title}, header=#{autoSplitPDF.header})}">
+  </th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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">
+              <svg class="material-symbols-rounded tool-header-icon advance">
+                <use xlink:href="/images/split-auto.svg#icon-split-auto"></use>
+              </svg>
+              <span class="tool-header-text" th:text="#{autoSplitPDF.header}"></span>
+            </div>
+
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/misc/auto-split-pdf'}">
+              <p th:text="#{autoSplitPDF.formPrompt}"></p>
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+              <div class="form-check ms-3">
+                <input id="duplexMode" name="duplexMode" type="checkbox">
+                <label for="duplexMode" th:text=#{autoSplitPDF.duplexMode}></label>
+              </div>
+              <p>
+                <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#info" role="button"
+                  aria-expanded="false" aria-controls="info" th:text="#{info}"></a>
+              </p>
+              <div class="collapse" id="info">
+                <!-- Added a brief description -->
+                <p th:text="#{autoSplitPDF.description}"></p>
+                <ul>
+                  <li th:text="#{autoSplitPDF.selectText.1}"></li>
+                  <li th:text="#{autoSplitPDF.selectText.2}"></li>
+                  <li th:text="#{autoSplitPDF.selectText.3}"></li>
+                  <li th:text="#{autoSplitPDF.selectText.4}"></li>
+                </ul>
+                <p><a th:href="@{'/files/Auto%20Splitter%20Divider%20(with%20instructions).pdf'}" download
+                    th:text="#{autoSplitPDF.dividerDownload2}"></a></p>
+              </div>
+
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{autoSplitPDF.submit}"></button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,88 @@
+<!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=#{changeCreds.title}, header=#{changeCreds.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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-9 bg-card">
+
+              <!-- User Settings Title -->
+              <h2 class="text-center" th:text="#{changeCreds.header}">User Settings</h2>
+              <hr>
+              <th:block th:if="${messageType}">
+              <div class="alert alert-danger">
+                <span th:text="#{${messageType}}">Default message if not found</span>
+              </div>
+              </th:block>
+              <!-- At the top of the user settings -->
+              <h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
+
+              <!-- Change Username Form -->
+              <h4 th:text="#{changeCreds.changePassword}">Change password</h4>
+              <form th:action="@{'api/v1/user/change-password-on-login'}" method="post" id="formsavechangecreds">
+                <div class="mb-3">
+                  <label for="currentPassword" th:text="#{changeCreds.oldPassword}">Old Password</label>
+                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{changeCreds.oldPassword}">
+                </div>
+                <div class="mb-3">
+                  <label for="newPassword" th:text="#{changeCreds.newPassword}">New Password</label>
+                  <input type="password" class="form-control" name="newPassword" id="newPassword" th:placeholder="#{changeCreds.newPassword}">
+                </div>
+                <div class="mb-3">
+                  <label for="confirmNewPassword" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
+                  <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
+                </div>
+                <div class="mb-3">
+                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
+                  <button type="submit" class="btn btn-primary" th:text="#{changeCreds.submit}">Change credentials!</button>
+                </div>
+              </form>
+              <script th:inline="javascript">
+                $(document).ready(function() {
+                  $.validator.addMethod("passwordMatch", function(value, element) {
+                    return $('#newPassword').val() === $('#confirmNewPassword').val();
+                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
+                  $('#formsavechangecreds').validate({
+                    rules: {
+                      currentPassword: {
+                        required: true
+                      },
+                      newPassword: {
+                        required: true
+                      },
+                      confirmNewPassword: {
+                        required: true,
+                        passwordMatch: true
+                      },
+                      errorPlacement: function(error, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").text(error.text()).show();
+                          } else {
+                              error.insertAfter(element);
+                          }
+                      },
+                      success: function(label, element) {
+                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+                            $("#confirmPasswordError").hide();
+                          }
+                      }
+                    }
+                  });
+                });
+              </script>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}" th:dir="#{language.direction}" th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{cbrToPDF.title}, header=#{cbrToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">auto_stories</span>
+              <span class="tool-header-text" th:text="#{cbrToPDF.header}"></span>
+            </div>
+            <form enctype="multipart/form-data" id="cbrToPDFForm" method="post"
+              th:action="@{'/api/v1/convert/cbr/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.cbr,.rar', inputText=#{cbrToPDF.selectText})}">
+              </div>
+              
+              <div class="form-check mb-3" th:if="${@endpointConfiguration.isGroupEnabled('Ghostscript')}">
+                <input id="optimizeForEbook" name="optimizeForEbook" type="checkbox" value="true">
+                <label for="optimizeForEbook" th:text="#{cbrToPDF.optimizeForEbook}">Optimize PDF for ebook readers (uses Ghostscript)</label>
+              </div>
+              
+              <br>
+              <button class="btn btn-primary" id="submitBtn" th:text="#{cbrToPDF.submit}" type="submit">Convert to PDF</button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}" th:dir="#{language.direction}" th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{cbzToPDF.title}, header=#{cbzToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">auto_stories</span>
+              <span class="tool-header-text" th:text="#{cbzToPDF.header}"></span>
+            </div>
+            <form enctype="multipart/form-data" id="cbzToPDFForm" method="post"
+              th:action="@{'/api/v1/convert/cbz/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.cbz,.zip', inputText=#{cbzToPDF.selectText})}">
+              </div>
+              
+              <div class="form-check mb-3" th:if="${@endpointConfiguration.isGroupEnabled('Ghostscript')}">
+                <input id="optimizeForEbook" name="optimizeForEbook" type="checkbox" value="true">
+                <label for="optimizeForEbook" th:text="#{cbzToPDF.optimizeForEbook}">Optimize PDF for ebook readers (uses Ghostscript)</label>
+              </div>
+              
+              <br>
+              <button class="btn btn-primary" id="submitBtn" th:text="#{cbzToPDF.submit}" type="submit">Convert to PDF</button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}"
+  th:dir="#{language.direction}"
+  th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+  <head>
+    <th:block th:insert="~{fragments/common :: head(title=#{ebookToPDF.title}, header=#{ebookToPDF.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convertto">menu_book</span>
+                <span class="tool-header-text"
+                  th:text="#{ebookToPDF.header}"></span>
+              </div>
+              <p th:text="#{processTimeWarning}"></p>
+
+              <div class="alert alert-warning"
+                th:if="${!@endpointConfiguration.isGroupEnabled('Calibre')}">
+                <span th:text="#{ebookToPDF.calibreDisabled}">Calibre support is disabled.</span>
+              </div>
+
+              <form enctype="multipart/form-data"
+                id="ebookToPDFForm"
+                method="post"
+                th:action="@{'/api/v1/convert/ebook/pdf'}"
+                th:if="${@endpointConfiguration.isGroupEnabled('Calibre')}">
+                <div
+                  th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.epub,.mobi,.azw3,.fb2,.txt,.docx', inputText=#{ebookToPDF.selectText})}">
+                </div>
+
+                <div class="form-check mb-3">
+                  <input id="embedAllFonts" name="embedAllFonts" type="checkbox" value="true">
+                  <label for="embedAllFonts" th:text="#{ebookToPDF.embedAllFonts}"></label>
+                </div>
+
+                <div class="form-check mb-3">
+                  <input id="includeTableOfContents"
+                    name="includeTableOfContents"
+                    type="checkbox"
+                    value="true">
+                  <label for="includeTableOfContents" th:text="#{ebookToPDF.includeTableOfContents}"></label>
+                </div>
+
+                <div class="form-check mb-3">
+                  <input id="includePageNumbers" name="includePageNumbers" type="checkbox" value="true">
+                  <label for="includePageNumbers" th:text="#{ebookToPDF.includePageNumbers}"></label>
+                </div>
+
+                <div class="form-check mb-3"
+                  th:if="${@endpointConfiguration.isGroupEnabled('Ghostscript')}">
+                  <input id="optimizeForEbook"
+                    name="optimizeForEbook"
+                    type="checkbox"
+                    value="true">
+                  <label for="optimizeForEbook" th:text="#{ebookToPDF.optimizeForEbook}"></label>
+                </div>
+
+                <button class="btn btn-primary"
+                  id="submitBtn"
+                  th:text="#{ebookToPDF.submit}"
+                  type="submit">Convert to
+                  PDF</button>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+
+</html>
@@ -0,0 +1,97 @@
+<!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=#{EMLToPDF.title}, header=#{EMLToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <div id="page-container">
+    <div id="content-wrap">
+      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+      <div class="mt-4"></div>
+      <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 convertto">email</span>
+              <span class="tool-header-text" th:text="#{EMLToPDF.header}"></span>
+            </div>
+            <p th:text="#{processTimeWarning}"></p>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/eml/pdf'}" class="mt-4">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.eml,message/rfc822')}">
+              </div>
+              
+                      <div class="form-check mb-3">
+                        <input id="downloadHtml" name="downloadHtml" type="checkbox">
+                        <label for="downloadHtml" th:text="#{EMLToPDF.downloadHtml}"></label>
+                <div class="form-text" th:text="#{EMLToPDF.downloadHtmlHelp}"></div>
+              </div>
+              
+                      <div id="pdfOnlyOptions">
+                        <div class="form-check mb-3">
+                          <input checked id="includeAttachments" name="includeAttachments" type="checkbox">
+                          <label for="includeAttachments" th:text="#{EMLToPDF.includeAttachments}"></label>
+                </div>
+                
+                <div class="mb-3">
+                  <label for="maxAttachmentSizeMB" class="form-label" th:text="#{EMLToPDF.maxAttachmentSize}"></label>
+                  <input type="number" class="form-control" id="maxAttachmentSizeMB" name="maxAttachmentSizeMB" value="10" min="1" max="100">
+                </div>
+              </div>
+
+              <div class="mb-4">
+                <button class="btn btn-outline-primary" type="button" data-bs-toggle="collapse" 
+                        data-bs-target="#info" aria-expanded="false" aria-controls="info" th:text="#{info}">
+                </button>
+                <div class="collapse mt-3" id="info">
+                  <div class="card card-body">
+                    <p class="mb-2" th:text="#{EMLToPDF.help}"></p>
+                    <ul class="mb-0">
+                      <li th:text="#{EMLToPDF.troubleshootingTip1}"></li>
+                      <li th:text="#{EMLToPDF.troubleshootingTip2}"></li>
+                      <li th:text="#{EMLToPDF.troubleshootingTip3}"></li>
+                    </ul>
+                  </div>
+                </div>
+              </div>
+              
+              <div>
+                <br />
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{EMLToPDF.submit}"></button>
+              </div>
+            </form>
+
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+
+  <script th:inline="javascript">
+    document.addEventListener('DOMContentLoaded', function() {
+      const downloadHtml = document.getElementById('downloadHtml');
+      const pdfOnlyOptions = document.getElementById('pdfOnlyOptions');
+      const submitBtn = document.getElementById('submitBtn');
+      const submitText = /*[[#{EMLToPDF.submit}]]*/ 'Convert to PDF';
+      const downloadHtmlText = 'Download HTML intermediate file instead of PDF';
+
+      function updateFormState() {
+        if (pdfOnlyOptions && submitBtn) {
+          pdfOnlyOptions.style.display = downloadHtml.checked ? 'none' : 'block';
+          submitBtn.textContent = downloadHtml.checked ? downloadHtmlText : submitText;
+        }
+      }
+
+      if (downloadHtml) {
+        downloadHtml.addEventListener('change', updateFormState);
+        updateFormState();
+      }
+    });
+  </script>
+</body>
+</html>
@@ -0,0 +1,60 @@
+<!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=#{fileToPDF.title}, header=#{fileToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">draft</span>
+              <span class="tool-header-text" th:text="#{fileToPDF.header}"></span>
+            </div>
+            <p th:text="#{processTimeWarning}"></p>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/file/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false)}">
+              </div>
+              <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#info" role="button"
+                aria-expanded="false" aria-controls="info" th:text="#{fileToPDF.supportedFileTypesInfo}"></a>
+              <div class="collapse" id="info">
+                <p class="mt-3" th:text="#{fileToPDF.credit}"></p>
+                <p class="mt-3" th:text="#{fileToPDF.supportedFileTypes}"></p>
+                <p>Microsoft Word: (DOC, DOCX, DOT, DOTX)</p>
+                <p>Microsoft Excel: (CSV, XLS, XLSX, XLT, XLTX, SLK, DIF)</p>
+                <p>Microsoft PowerPoint: (PPT, PPTX)</p>
+                <p>OpenDocument Formats: (ODT, OTT, ODS, OTS, ODP, OTP, ODG, OTG)</p>
+                <p>Plain Text: (TXT, TEXT, XML)</p>
+                <p>Rich Text Format: (RTF)</p>
+                <p>Images: (BMP, GIF, JPEG, PNG, TIF, PBM, PGM, PPM, RAS, XBM, XPM, SVG, SVM, WMF)</p>
+                <p>HTML: (HTML)</p>
+                <p>Lotus Word Pro: (LWP)</p>
+                <p>StarOffice: (SDA, SDC, SDD, SDW, STC, STD, STI, STW, SXD, SXG, SXI, SXW)</p>
+                <p>Other: (DBF, FODS, VSD, VOR, VOR3, VOR4, UOP, PCT, PS, PDF)</p>
+                <a
+                  href="https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html">https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html</a>
+              </div>
+              <div>
+                <br />
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{fileToPDF.submit}"></button>
+              </div>
+            </form>
+
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,43 @@
+<!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=#{HTMLToPDF.title}, header=#{HTMLToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">html</span>
+              <span class="tool-header-text" th:text="#{HTMLToPDF.header}"></span>
+            </div>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/html/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='text/html,application/zip' )}">
+              </div>
+              <div class="mb-3">
+                <label for="zoom" th:text="#{HTMLToPDF.zoom}" class="form-label"></label>
+                <input type="number" step="0.1" class="form-control" id="zoom" name="zoom" value="1">
+              </div>
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{HTMLToPDF.submit}"></button>
+            </form>
+            <p class="mt-3" th:text="#{HTMLToPDF.help}"></p>
+            <p class="mt-3" th:text="#{HTMLToPDF.credit}"></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,127 @@
+<!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=#{imageToPDF.title}, header=#{imageToPDF.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">picture_as_pdf</span>
+              <span class="tool-header-text" th:text="#{imageToPDF.header}"></span>
+            </div>
+            <form id="imageToPDFForm" method="post" enctype="multipart/form-data"
+              th:action="@{'/api/v1/convert/img/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='image/*,.psd', inputText=#{imgPrompt})}">
+              </div>
+              <div class="mb-3">
+                <label for="fitOption" th:text="#{imageToPDF.selectLabel}">Fit Options</label>
+                <select class="form-control" id="fitOption" name="fitOption">
+                  <option value="fillPage" th:text="#{imageToPDF.fillPage}">Fill Page</option>
+                  <option value="fitDocumentToImage" th:text="#{imageToPDF.fitDocumentToImage}">Fit Document to Image
+                  </option>
+                  <option value="maintainAspectRatio" th:text="#{imageToPDF.maintainAspectRatio}">Maintain Aspect Ratio
+                  </option>
+                </select>
+              </div>
+
+              <div class="form-check ms-3">
+                <input id="autoRotate" name="autoRotate" type="checkbox">
+                <label for="autoRotate" th:text=#{imageToPDF.selectText.2}></label>
+              </div>
+              <div class="mb-3">
+                <label th:text="#{pdfToImage.colorType}"></label>
+                <select class="form-control" id="colorType" name="colorType">
+                  <option value="color" th:text="#{pdfToImage.color}"></option>
+                  <option value="greyscale" th:text="#{pdfToImage.grey}"></option>
+                  <option value="blackwhite" th:text="#{pdfToImage.blackwhite}"></option>
+                </select>
+              </div>
+              <input type="hidden" id="override" name="override" value="multi">
+              <div class="mb-3">
+                <label th:text=#{imageToPDF.selectText.3}></label>
+                <select class="form-control" id="conversionType" name="conversionType" disabled>
+                  <option value="merge" th:text=#{imageToPDF.selectText.4}></option>
+                  <option value="convert" th:text=#{imageToPDF.selectText.5} selected></option>
+                </select>
+              </div>
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
+              <script>
+                $('#fileInput-input').on('change', function (e) {
+                  const fileInput = e.target;
+                  fileInput.addEventListener('file-input-change', async (e) => {
+                    const { allFiles } = e.detail;
+                    var conversionType = document.getElementById("conversionType");
+                    console.log("files.length=" + allFiles.length)
+                    if (allFiles.length > 1) {
+                      conversionType.disabled = false;
+                    } else {
+                      conversionType.disabled = true;
+                    }
+                  });
+                });
+
+                $('#conversionType').change(function () {
+                  var selectedValue = $(this).val();
+                  var override = document.getElementById("override");
+                  console.log("selectedValue=" + selectedValue)
+                  if (selectedValue === 'merge') {
+                    override.value = "single";
+                  } else if (selectedValue === 'convert') {
+                    override.value = "multi";
+                  }
+                });
+                document.getElementById("imageToPDFForm").addEventListener("submit", async function (e) {
+                  e.preventDefault();
+
+                  const form = e.target;
+                  const formData = new FormData(form);
+
+                  const fitOptionSelect = document.getElementById("fitOption");
+                  const fitOptionValue = fitOptionSelect ? fitOptionSelect.value : "fit-to-page"; // Default value
+                  formData.append("fitOption", fitOptionValue);
+
+                  const overrideInput = document.getElementById("override");
+                  console.log("Override value before submission:", overrideInput.value);
+
+                  for (let [key, value] of formData.entries()) {
+                    console.log(`${key}:`, value);
+                  }
+
+                  try {
+                    const response = await fetch(form.action, {
+                      method: "POST",
+                      body: formData
+                    });
+
+                    if (response.ok) {
+                      console.log("Form successfully submitted");
+                    } else {
+                      console.error("Failed to submit the form");
+                    }
+                  } catch (error) {
+                    console.error("Error submitting the form:", error);
+                  }
+                });
+              </script>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,39 @@
+<!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=#{MarkdownToPDF.title}, header=#{MarkdownToPDF.header})}">
+  </th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">markdown</span>
+              <span class="tool-header-text" th:text="#{MarkdownToPDF.header}"></span>
+            </div>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/markdown/pdf'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.md')}">
+              </div>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{MarkdownToPDF.submit}"></button>
+            </form>
+            <p class="mt-3" th:text="#{MarkdownToPDF.help}"></p>
+            <p class="mt-3" th:text="#{MarkdownToPDF.credit}"></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}" th:dir="#{language.direction}" th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{pdfToCBR.title}, header=#{pdfToCBR.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convertto">auto_stories</span>
+              <span class="tool-header-text" th:text="#{pdfToCBR.header}"></span>
+            </div>
+            <form enctype="multipart/form-data" id="pdfToCBRForm" method="post"
+              th:action="@{'/api/v1/convert/pdf/cbr'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.pdf', inputText=#{pdfToCBR.selectText})}">
+              </div>
+              
+              <div class="mb-3">
+                <label class="form-label" for="dpi" th:text="#{pdfToCBR.dpi}">DPI:</label>
+                <input class="form-control" id="dpi" max="600" min="50" name="dpi" type="number" value="300">
+                <div class="form-text" th:text="#{pdfToCBR.dpiHelp}">Higher DPI results in better quality but larger file size.</div>
+              </div>
+              
+              <br>
+              <button class="btn btn-primary" id="submitBtn" th:text="#{pdfToCBR.submit}" type="submit">Convert to CBR</button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}" th:dir="#{language.direction}" th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{pdfToCBZ.title}, header=#{pdfToCBZ.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convert">auto_stories</span>
+              <span class="tool-header-text" th:text="#{pdfToCBZ.header}"></span>
+            </div>
+            <form enctype="multipart/form-data" id="pdfToCBZForm" method="post"
+              th:action="@{'/api/v1/convert/pdf/cbz'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf', inputText=#{pdfToCBZ.selectText})}">
+              </div>
+              <div class="mb-3">
+                <label for="dpi" th:text="#{pdfToCBZ.dpi}">DPI:</label>
+                <input class="form-control" id="dpi" max="600" min="72" name="dpi" required step="1" type="number" value="300">
+              </div>
+              <br>
+              <button class="btn btn-primary" id="submitBtn" th:text="#{pdfToCBZ.submit}" type="submit">Convert to CBZ</button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,46 @@
+<!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=#{PDFToCSV.title}, header=#{PDFToCSV.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 convert">csv</span>
+                <span class="tool-header-text" th:text="#{PDFToCSV.header}"></span>
+              </div>
+              <form id="PDFToCSVForm" th:action="@{'/api/v1/convert/pdf/csv'}" method="post" enctype="multipart/form-data">
+                <input  id="pageNumbers" type="hidden" name="pageNumbers">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToCSV.submit}"></button>
+              </form>
+              <p id="instruction-text" style="margin: 0; display: none" th:text="#{PDFToCSV.prompt}"></p>
+
+              <div style="position: relative; width: auto;" id="canvasesContainer">
+                <div>
+                  <div style="display:none ;margin: 3px;position: absolute;top: 0;width: 120px;justify-content:space-between;z-index: 10" id="pagination-button-container">
+                    <button id='previous-page-btn' style='opacity: 80% ; width: 50px; height: 30px; display: flex;align-items: center;justify-content: center; background: grey; color: #ffffff;  ;border: none;outline: none; border-radius: 4px;'> &lt; </button>
+                    <button id='next-page-btn' style='opacity: 80% ; width: 50px; height: 30px; display: flex;align-items: center;justify-content: center; background: grey; color: #ffffff;  ;border: none;outline: none; border-radius: 4px;'> &gt; </button>
+                  </div>
+                  <canvas id="cropPdfCanvas" style="width: 100%"></canvas>
+                </div>
+                <canvas id="overlayCanvas" style="position: absolute; top: 0; left: 0; z-index: 2; width: 100%"></canvas>
+              </div>
+              <script type="module" th:src="@{'/pdfjs-legacy/pdf.mjs'}"></script>
+              <script type="module" th:src="@{'/js/pages/pdf-to-csv.js'}">
+              </script>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}"
+  th:dir="#{language.direction}"
+  th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+  <head>
+    <th:block th:insert="~{fragments/common :: head(title=#{pdfToEpub.title}, header=#{pdfToEpub.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convert">menu_book</span>
+                <span class="tool-header-text"
+                  th:text="#{pdfToEpub.header}"></span>
+              </div>
+              <p th:text="#{processTimeWarning}"></p>
+
+              <div class="alert alert-warning"
+                th:if="${!@endpointConfiguration.isGroupEnabled('Calibre')}">
+                <span th:text="#{pdfToEpub.calibreDisabled}">Calibre support is disabled.</span>
+              </div>
+
+              <form enctype="multipart/form-data"
+                id="pdfToEpubForm"
+                method="post"
+                th:action="@{'/api/v1/convert/pdf/epub'}"
+                th:if="${@endpointConfiguration.isGroupEnabled('Calibre')}">
+                <div
+                  th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.pdf', inputText=#{pdfToEpub.selectText})}">
+                </div>
+
+                <div class="mb-3">
+                  <label class="form-label" for="outputFormat"
+                    th:text="#{pdfToEpub.outputFormat}"></label>
+                  <select class="form-select"
+                    id="outputFormat"
+                    name="outputFormat">
+                    <option selected
+                      th:text="#{pdfToEpub.outputFormat.epub}"
+                      value="EPUB"></option>
+                    <option th:text="#{pdfToEpub.outputFormat.azw3}"
+                      value="AZW3"></option>
+                  </select>
+                </div>
+
+                <div class="form-check mb-3">
+                  <input checked id="detectChapters" name="detectChapters" type="checkbox">
+                  <label for="detectChapters" th:text="#{pdfToEpub.detectChapters}"></label>
+                </div>
+
+                <div class="mb-3">
+                  <label class="form-label" for="targetDevice"
+                    th:text="#{pdfToEpub.targetDevice}"></label>
+                  <select class="form-select"
+                    id="targetDevice"
+                    name="targetDevice">
+                    <option selected
+                      th:text="#{pdfToEpub.targetDevice.tablet}"
+                      value="TABLET_PHONE_IMAGES"></option>
+                    <option th:text="#{pdfToEpub.targetDevice.kindle}"
+                      value="KINDLE_EINK_TEXT"></option>
+                  </select>
+                </div>
+
+                <button class="btn btn-primary"
+                  id="submitBtn"
+                  th:text="#{pdfToEpub.submit}"
+                  type="submit">Convert</button>
+              </form>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+
+</html>
@@ -0,0 +1,33 @@
+<!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=#{PDFToHTML.title}, header=#{PDFToHTML.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convert">html</span>
+                <span class="tool-header-text" th:text="#{PDFToHTML.header}"></span>
+              </div>
+              <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/html'}">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                <br>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToHTML.submit}"></button>
+              </form>
+              <p class="mt-3" th:text="#{PDFToHTML.credit}"></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,95 @@
+<!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=#{pdfToImage.title}, header=#{pdfToImage.header})}"></th:block>
+  <script th:inline="javascript">
+    document.addEventListener("DOMContentLoaded", function () {
+      const maxDPI = /*[[${maxDPI}]]*/ 500; // Maximum DPI for PDF to image conversion
+      const maxDPILabelRaw = /*[[#{pdfToImage.dpi}]]*/ "DPI (The server limit is {0} dpi)";
+      const maxDPILabel = maxDPILabelRaw.replace("{0}", maxDPI); // Replace with actual value from properties
+      const dpilabel = document.querySelector('label[for="dpi"]');
+      if (dpilabel) {
+        dpilabel.textContent = maxDPILabel;
+      }
+      const maxDPIInput = document.getElementById("dpi");
+      if (maxDPIInput) {
+        maxDPIInput.setAttribute("max", maxDPI); // Set the maximum value for DPI input
+      }
+    });
+  </script>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convert">photo_library</span>
+              <span class="tool-header-text" th:text="#{pdfToImage.header}"></span>
+            </div>
+            <p th:text="#{processTimeWarning}"></p>
+            <p th:if="${!isPython}" th:text="#{pdfToImage.info}">Python is not installed. Required for WebP conversion.
+            </p>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/img'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+              <div class="mb-3">
+                <label th:text="#{pdfToImage.selectText}"></label>
+                <select class="form-control" name="imageFormat">
+                  <option value="png">PNG</option>
+                  <option value="jpg">JPG</option>
+                  <option value="gif">GIF</option>
+                  <option value="tiff">TIFF</option>
+                  <option value="bmp">BMP</option>
+                  <option th:if="${isPython}" value="webp">WEBP</option>
+                </select>
+              </div>
+              <div class="mb-3">
+                <label th:text="#{pdfToImage.singleOrMultiple}"></label>
+                <select class="form-control" name="singleOrMultiple">
+                  <option value="multiple" th:text="#{pdfToImage.multi}"></option>
+                  <option value="single" th:text="#{pdfToImage.single}"></option>
+                </select>
+              </div>
+
+              <div class="mb-3" id="singleOptionSection">
+                <label for="pageNumbers" th:text="#{pageSelectionPrompt}"></label>
+                <input type="text" name="pageNumbers" class="form-control" id="pageNumbers" value="all"
+                  th:placeholder="#{pdfToImage.placeholder}" required>
+              </div>
+              <div class="mb-3">
+                <label th:text="#{pdfToImage.colorType}"></label>
+                <select class="form-control" name="colorType">
+                  <option value="color" th:text="#{pdfToImage.color}"></option>
+                  <option value="greyscale" th:text="#{pdfToImage.grey}"></option>
+                  <option value="blackwhite" th:text="#{pdfToImage.blackwhite}"></option>
+                </select>
+              </div>
+              <div class="form-check mb-3">
+                <input id="includeAnnotations" name="includeAnnotations" type="checkbox">
+                <label for="includeAnnotations" th:text="#{pdfToImage.includeAnnotations}"></label>
+              </div>
+              <div class="mb-3">
+                <label for="dpi">DPI:</label>
+                <input type="number" name="dpi" class="form-control" id="dpi" min="1" step="1" value="300" required>
+              </div>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pdfToImage.submit}"></button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+
+</body>
+
+</html>
@@ -0,0 +1,31 @@
+<!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=#{PDFToMarkdown.title}, header=#{PDFToMarkdown.header})}"></th:block>
+</head>
+
+<body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convert">markdown_copy</span>
+                            <span class="tool-header-text" th:text="#{PDFToMarkdown.header}"></span>
+                        </div>
+                        <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/markdown'}">
+                            <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='.pdf')}"></div>
+                            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToMarkdown.submit}"></button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+</body>
+</html>
@@ -0,0 +1,86 @@
+<!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=#{pdfToPDFA.title}, header=#{pdfToPDFA.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convert">picture_as_pdf</span>
+                <span class="tool-header-text" th:text="#{pdfToPDFA.header}"></span>
+              </div>
+              <p th:text="#{pdfToPDFA.tip}"></p>
+              <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/pdfa'}">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                <div class="mb-3">
+                  <label for="outputFormat" th:text="#{pdfToPDFA.outputFormat}"></label>
+                  <select class="form-control" name="outputFormat" id="outputFormat">
+                    <optgroup th:label="#{pdfToPDFA.pdfaFormats}">
+                      <option value="pdfa-1">PDF/A-1b</option>
+                      <option selected="selected" value="pdfa">PDF/A-2b (default)</option>
+                      <option value="pdfa-3">PDF/A-3b</option>
+                    </optgroup>
+                    <optgroup th:label="#{pdfToPDFA.pdfxFormats}">
+                      <option value="pdfx-1">PDF/X-1</option>
+                      <option value="pdfx-3">PDF/X-3</option>
+                      <option value="pdfx-4">PDF/X-4</option>
+                    </optgroup>
+                  </select>
+                </div>
+                <div id="result" class="alert-warning"></div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pdfToPDFA.submit}"></button>
+              </form>
+              <script type="module" th:src="@{'/pdfjs-legacy/pdf.mjs'}"></script>
+              <script th:inline="javascript">
+                document.getElementById('fileInput-input').addEventListener('change', async () => {
+                  pdfjsLib.GlobalWorkerOptions.workerSrc = pdfjsPath + 'pdf.worker.mjs';
+                  const fileInput = document.getElementById('fileInput-input');
+                  const resultDiv = document.getElementById('result');
+
+                  const file = fileInput.files[0];
+                  const arrayBuffer = await file.arrayBuffer();
+
+                  try {
+                    const pdf = await pdfjsLib.getDocument({ data: arrayBuffer }).promise;
+
+                    let hasSignature = false;
+
+                    for (let i = 1; i <= pdf.numPages; i++) {
+                      const page = await pdf.getPage(i);
+                      const annotations = await page.getAnnotations({ intent: 'display' });
+
+                      annotations.forEach(annotation => {
+                        console.log(annotation)
+                        if (annotation.subtype === 'Widget' && annotation.fieldType === 'Sig') {
+                          hasSignature = true;
+                        }
+                      });
+                    }
+
+                    if (hasSignature) {
+                      /*<![CDATA[*/
+                      resultDiv.textContent = /*[[#{pdfToPDFA.pdfWithDigitalSignature}]]*/ "The PDF contains a digital signature. This will be removed in the next step.";
+                      /*]]>*/
+                    }
+                  } catch (error) {
+                    resultDiv.textContent = 'Error reading the PDF: ' + error.message;
+                  }
+              });
+              </script>
+              <p class="mt-3" th:text="#{pdfToPDFA.credit}"></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,49 @@
+<!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=#{PDFToPresentation.title}, header=#{PDFToPresentation.header})}">
+  </th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convert">slideshow</span>
+              <span class="tool-header-text" th:text="#{PDFToPresentation.header}"></span>
+            </div>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/presentation'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+              <div class="mb-3">
+                <label th:text="#{PDFToPresentation.selectText.1}"></label>
+                <select class="form-control" name="outputFormat">
+                  <option value="pptx">PPTX</option>
+                  <option value="ppt">PPT</option>
+                  <option value="odp">ODP</option>
+                </select>
+              </div>
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary"
+                th:text="#{PDFToPresentation.submit}"></button>
+            </form>
+            <p class="mt-3" th:text="#{PDFToPresentation.credit}"></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
@@ -0,0 +1,39 @@
+<!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=#{PDFToText.title}, header=#{PDFToText.header})}"></th:block>
+  </head>
+
+  <body>
+    <th:block th:insert="~{fragments/common :: game}"></th:block>
+    <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 convert">text_fields</span>
+                <span class="tool-header-text" th:text="#{PDFToText.header}"></span>
+              </div>
+              <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/convert/pdf/text'}">
+                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
+                <div class="mb-3">
+                  <label th:text="#{PDFToText.selectText.1}"></label>
+                  <select class="form-control" name="outputFormat">
+                    <option th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" value="rtf">RTF</option>
+                    <option value="txt">TXT</option>
+                  </select>
+                </div>
+                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{PDFToText.submit}"></button>
+              </form>
+              <p th:if="${@endpointConfiguration.isEndpointEnabled('pdf-to-rtf')}" class="mt-3" th:text="#{PDFToText.credit}"></p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+    </div>
+  </body>
+</html>
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html th:data-language="${#locale.toString()}" th:dir="#{language.direction}" th:lang="${#locale.language}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{pdfToVector.title}, header=#{pdfToVector.header})}"></th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <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 convert">stroke_full</span>
+              <span class="tool-header-text" th:text="#{pdfToVector.header}"></span>
+            </div>
+            <form enctype="multipart/form-data" method="post" th:action="@{'/api/v1/convert/pdf/vector'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+              <div class="mb-3">
+                <label for="outputFormat" th:text="#{pdfToVector.outputFormat}"></label>
+                <select class="form-control" id="outputFormat" name="outputFormat">
+                  <option selected value="eps">EPS (Encapsulated PostScript)</option>
+                  <option value="ps">PS (PostScript)</option>
+                  <option value="pcl">PCL (Printer Command Language)</option>
+                  <option value="xps">XPS (XML Paper Specification)</option>
+                </select>
+              </div>
+              <button class="btn btn-primary" id="submitBtn" th:text="#{pdfToVector.submit}" type="submit"></button>
+            </form>
+            <p class="mt-3" th:text="#{pdfToVector.description}"></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
+</html>
--- a/Show More
+++ b/Show More