diff --git a/.github/workflows/PR-Demo-Comment-with-react.yml b/.github/workflows/PR-Demo-Comment-with-react.yml
index e9dcc3d8b..8bb7475e3 100644
--- a/.github/workflows/PR-Demo-Comment-with-react.yml
+++ b/.github/workflows/PR-Demo-Comment-with-react.yml
@@ -41,7 +41,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -129,7 +129,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -165,7 +165,7 @@ jobs:
           STIRLING_PDF_DESKTOP_UI: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
 
       - name: Get version number
         id: versionNumber
diff --git a/.github/workflows/PR-Demo-cleanup.yml b/.github/workflows/PR-Demo-cleanup.yml
index 1962bb83d..ae17ee7c8 100644
--- a/.github/workflows/PR-Demo-cleanup.yml
+++ b/.github/workflows/PR-Demo-cleanup.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/auto-labeler.yml b/.github/workflows/auto-labeler.yml
index 5f350d2d4..5828a2556 100644
--- a/.github/workflows/auto-labeler.yml
+++ b/.github/workflows/auto-labeler.yml
@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3630ed35d..7ead7cb6f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -103,7 +103,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -147,7 +147,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -161,7 +161,7 @@ jobs:
           distribution: "adopt"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
 
       - name: Install Docker Compose
         run: |
diff --git a/.github/workflows/check_properties.yml b/.github/workflows/check_properties.yml
index eb62f7f5b..c1032d00c 100644
--- a/.github/workflows/check_properties.yml
+++ b/.github/workflows/check_properties.yml
@@ -18,7 +18,7 @@ jobs:
       pull-requests: write # Allow writing to pull requests
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 5a662f423..4f44295f7 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/licenses-update.yml b/.github/workflows/licenses-update.yml
index f9fb1e521..b62e581ca 100644
--- a/.github/workflows/licenses-update.yml
+++ b/.github/workflows/licenses-update.yml
@@ -19,7 +19,7 @@ jobs:
       repository-projects: write # Required for enabling automerge
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -42,7 +42,7 @@ jobs:
           distribution: "adopt"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
       - name: Check licenses for compatibility
         run: ./gradlew clean checkLicense
diff --git a/.github/workflows/manage-label.yml b/.github/workflows/manage-label.yml
index 73ece41ae..3f123afbd 100644
--- a/.github/workflows/manage-label.yml
+++ b/.github/workflows/manage-label.yml
@@ -15,7 +15,7 @@ jobs:
       issues: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index c934b7129..9332f6892 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -21,7 +21,7 @@ jobs:
       versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -56,7 +56,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -68,7 +68,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
         with:
           gradle-version: 8.14
 
@@ -106,7 +106,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -144,7 +144,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -156,7 +156,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
         with:
           gradle-version: 8.14
 
@@ -234,7 +234,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -297,7 +297,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -306,7 +306,7 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           tag_name: v${{ needs.read_versions.outputs.version }}
           generate_release_notes: true
diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml
index 5cca4e76e..1190c49cd 100644
--- a/.github/workflows/pre_commit.yml
+++ b/.github/workflows/pre_commit.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index 03ea3464d..2ca7c5972 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -18,7 +18,7 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -30,7 +30,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
         with:
           gradle-version: 8.14
 
@@ -48,7 +48,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
 
       - name: Get version number
         id: versionNumber
diff --git a/.github/workflows/releaseArtifacts.yml b/.github/workflows/releaseArtifacts.yml
index 5434eec96..d21bbce4b 100644
--- a/.github/workflows/releaseArtifacts.yml
+++ b/.github/workflows/releaseArtifacts.yml
@@ -23,7 +23,7 @@ jobs:
       version: ${{ steps.versionNumber.outputs.versionNumber }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -35,7 +35,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
         with:
           gradle-version: 8.14
 
@@ -83,7 +83,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -161,7 +161,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -171,7 +171,7 @@ jobs:
           name: signed${{ matrix.file_suffix }}
 
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # v2.1.0
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           tag_name: v${{ needs.build.outputs.version }}
           generate_release_notes: true
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 1e531075a..a79dc0ec2 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -74,6 +74,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 16d004dd9..187e823ae 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
       - name: Build and analyze with Gradle
         env:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 4000f0e6f..17d81412a 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -16,7 +16,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml
index 0e06cb1ee..6b9307887 100644
--- a/.github/workflows/swagger.yml
+++ b/.github/workflows/swagger.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -26,7 +26,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs
diff --git a/.github/workflows/sync_files.yml b/.github/workflows/sync_files.yml
index dd29b0d4b..f89f36b2a 100644
--- a/.github/workflows/sync_files.yml
+++ b/.github/workflows/sync_files.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml
index e4ef4138f..9ef0754f6 100644
--- a/.github/workflows/testdriver.yml
+++ b/.github/workflows/testdriver.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -31,7 +31,7 @@ jobs:
           DISABLE_ADDITIONAL_FEATURES: true
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
 
       - name: Get version number
         id: versionNumber
@@ -105,7 +105,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
@@ -134,7 +134,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
diff --git a/README.md b/README.md
index 5551b98bb..04c77c3e5 100644
--- a/README.md
+++ b/README.md
@@ -131,10 +131,10 @@ Stirling-PDF currently supports 40 languages!
 | German (Deutsch) (de_DE)                     | ![96%](https://geps.dev/progress/96)   |
 | Greek (Ελληνικά) (el_GR)                     | ![74%](https://geps.dev/progress/74)   |
 | Hindi (हिंदी) (hi_IN)                          | ![74%](https://geps.dev/progress/74)   |
-| Hungarian (Magyar) (hu_HU)                   | ![97%](https://geps.dev/progress/97)   |
+| Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
 | Indonesian (Bahasa Indonesia) (id_ID)        | ![68%](https://geps.dev/progress/68)   |
 | Irish (Gaeilge) (ga_IE)                      | ![75%](https://geps.dev/progress/75)   |
-| Italian (Italiano) (it_IT)                   | ![87%](https://geps.dev/progress/87)   |
+| Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
 | Japanese (日本語) (ja_JP)                    | ![76%](https://geps.dev/progress/76)   |
 | Korean (한국어) (ko_KR)                      | ![75%](https://geps.dev/progress/75)   |
 | Norwegian (Norsk) (no_NB)                    | ![73%](https://geps.dev/progress/73)   |
@@ -147,11 +147,11 @@ Stirling-PDF currently supports 40 languages!
 | Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![48%](https://geps.dev/progress/48)   |
 | Simplified Chinese (简体中文) (zh_CN)         | ![98%](https://geps.dev/progress/98)   |
 | Slovakian (Slovensky) (sk_SK)                | ![57%](https://geps.dev/progress/57)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![79%](https://geps.dev/progress/79)   |
-| Spanish (Español) (es_ES)                    | ![82%](https://geps.dev/progress/82)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![78%](https://geps.dev/progress/78)   |
+| Spanish (Español) (es_ES)                    | ![81%](https://geps.dev/progress/81)   |
 | Swedish (Svenska) (sv_SE)                    | ![72%](https://geps.dev/progress/72)   |
 | Thai (ไทย) (th_TH)                           | ![65%](https://geps.dev/progress/65)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![0%](https://geps.dev/progress/0) |
+| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![72%](https://geps.dev/progress/72) |
 | Traditional Chinese (繁體中文) (zh_TW)        | ![83%](https://geps.dev/progress/83)   |
 | Turkish (Türkçe) (tr_TR)                     | ![81%](https://geps.dev/progress/81)   |
 | Ukrainian (Українська) (uk_UA)               | ![78%](https://geps.dev/progress/78)   |
diff --git a/allowed-licenses.json b/allowed-licenses.json
index 12d82d48a..80e919439 100644
--- a/allowed-licenses.json
+++ b/allowed-licenses.json
@@ -124,10 +124,18 @@
       "moduleName": ".*",
       "moduleLicense": "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0"
     },
+    {
+      "moduleName": ".*",
+      "moduleLicense": "Eclipse Public License 1.0"
+    },
     {
       "moduleName": ".*",
       "moduleLicense": "Eclipse Public License - v 1.0"
     },
+    {
+      "moduleName": ".*",
+      "moduleLicense": "Eclipse Public License v2.0"
+    },
     {
       "moduleName": ".*",
       "moduleLicense": "Eclipse Public License v. 2.0"
diff --git a/build.gradle b/build.gradle
index e7b4c3e98..2b63508c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,11 @@ ext {
     pdfboxVersion = "3.0.5"
     imageioVersion = "3.12.0"
     lombokVersion = "1.18.38"
-    bouncycastleVersion = "1.80"
-    springSecuritySamlVersion = "6.5.0"
+    bouncycastleVersion = "1.81"
+    springSecuritySamlVersion = "6.5.1"
     openSamlVersion = "4.3.2"
     commonmarkVersion = "0.24.0"
+    googleJavaFormatVersion = "1.27.0"
     tempJrePath = null
 }
 
@@ -119,7 +120,7 @@ subprojects {
 
     dependencies {
         implementation 'org.springframework.boot:spring-boot-starter-actuator'
-        implementation 'io.github.pixee:java-security-toolkit:1.2.1'
+        implementation 'io.github.pixee:java-security-toolkit:1.2.2'
 
         //tmp for security bumps
         implementation 'ch.qos.logback:logback-core:1.5.18'
@@ -475,7 +476,7 @@ spotless {
         target project(':proprietary').sourceSets.main.allJava
         target project(':stirling-pdf').sourceSets.main.allJava
 
-        googleJavaFormat("1.27.0").aosp().reorderImports(false)
+        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
 
         importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
         toggleOffOn()
diff --git a/common/build.gradle b/common/build.gradle
index 76c07ae8d..c55648f06 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -2,7 +2,12 @@
 bootRun {
     enabled = false
 }
-
+spotless {
+    java {
+        target sourceSets.main.allJava
+        googleJavaFormat(googleJavaFormatVersion).aosp()
+    }
+}
 dependencies {
     api 'org.springframework.boot:spring-boot-starter-web'
     api 'org.springframework.boot:spring-boot-starter-thymeleaf'
@@ -15,6 +20,6 @@ dependencies {
     api "org.apache.pdfbox:pdfbox:$pdfboxVersion"
     api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
     api 'org.snakeyaml:snakeyaml-engine:2.9'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8"
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9"
     api 'jakarta.mail:jakarta.mail-api:2.1.3'
-}
\ No newline at end of file
+}
diff --git a/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java b/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java
index 2c0341e19..d6e131ff9 100644
--- a/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java
+++ b/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java
@@ -4,10 +4,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
-import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
 
 /** A custom RandomAccessRead implementation that deletes the file when closed */
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/common/src/main/java/stirling/software/common/configuration/AppConfig.java
index e799c7c63..393e29f1f 100644
--- a/common/src/main/java/stirling/software/common/configuration/AppConfig.java
+++ b/common/src/main/java/stirling/software/common/configuration/AppConfig.java
@@ -248,17 +248,16 @@ public class AppConfig {
         return applicationProperties.getSystem().getDatasource();
     }
 
-
     @Bean(name = "runningProOrHigher")
     @Profile("default")
     public boolean runningProOrHigher() {
-    	return false;
+        return false;
     }
 
     @Bean(name = "runningEE")
     @Profile("default")
     public boolean runningEnterprise() {
-    	return false;
+        return false;
     }
 
     @Bean(name = "GoogleDriveEnabled")
@@ -273,10 +272,9 @@ public class AppConfig {
         return "NORMAL";
     }
 
-
     @Bean(name = "disablePixel")
     public boolean disablePixel() {
-    	return Boolean.parseBoolean(env.getProperty("DISABLE_PIXEL", "false"));
+        return Boolean.parseBoolean(env.getProperty("DISABLE_PIXEL", "false"));
     }
 
     @Bean(name = "machineType")
diff --git a/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java b/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java
index 50090ee51..436e0c909 100644
--- a/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java
+++ b/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java
@@ -10,9 +10,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.util.YamlHelper;
 
 /**
diff --git a/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java b/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
index 320d9aaac..7bb41812d 100644
--- a/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
+++ b/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
@@ -3,16 +3,13 @@ package stirling.software.common.configuration;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
 import org.thymeleaf.templateresource.FileTemplateResource;
 import org.thymeleaf.templateresource.ITemplateResource;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.InputStreamTemplateResource;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java b/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
index d087f2a7a..591238eab 100644
--- a/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
+++ b/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
@@ -2,7 +2,6 @@ package stirling.software.common.configuration;
 
 import java.io.File;
 import java.nio.file.Paths;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java b/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java
index 589b5cac9..3cc89e640 100644
--- a/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java
+++ b/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java
@@ -1,15 +1,12 @@
 package stirling.software.common.configuration;
 
+import com.posthog.java.PostHog;
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.posthog.java.PostHog;
-
-import jakarta.annotation.PreDestroy;
-
-import lombok.extern.slf4j.Slf4j;
-
 @Configuration
 @Slf4j
 public class PostHogConfig {
diff --git a/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java b/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java
index 5fadfb352..19c4b0a92 100644
--- a/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java
+++ b/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java
@@ -1,10 +1,8 @@
 package stirling.software.common.configuration;
 
-import org.springframework.stereotype.Component;
-
 import com.posthog.java.PostHogLogger;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
diff --git a/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java b/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java
index 53fa97c25..99c125a0c 100644
--- a/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java
+++ b/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java
@@ -2,13 +2,10 @@ package stirling.software.common.configuration;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Configuration;
-
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Configuration;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Operations;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Pipeline;
diff --git a/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java b/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
index efb98f260..17ad21bfd 100644
--- a/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
+++ b/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
@@ -1,7 +1,6 @@
 package stirling.software.common.configuration;
 
 import java.util.Properties;
-
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
diff --git a/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
index 1c514b0a0..b63acdf26 100644
--- a/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
+++ b/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
@@ -12,7 +12,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
@@ -24,13 +28,6 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.stereotype.Component;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.configuration.YamlPropertySourceFactory;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/common/src/main/java/stirling/software/common/model/FileInfo.java b/common/src/main/java/stirling/software/common/model/FileInfo.java
index 41a3a4717..2c2b13ed5 100644
--- a/common/src/main/java/stirling/software/common/model/FileInfo.java
+++ b/common/src/main/java/stirling/software/common/model/FileInfo.java
@@ -5,7 +5,6 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java b/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
index 4bc81cafa..eb7dc61f8 100644
--- a/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
+++ b/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-
 import org.thymeleaf.templateresource.ITemplateResource;
 
 public class InputStreamTemplateResource implements ITemplateResource {
diff --git a/common/src/main/java/stirling/software/common/model/PdfMetadata.java b/common/src/main/java/stirling/software/common/model/PdfMetadata.java
index ef8684788..a640e9c63 100644
--- a/common/src/main/java/stirling/software/common/model/PdfMetadata.java
+++ b/common/src/main/java/stirling/software/common/model/PdfMetadata.java
@@ -1,7 +1,6 @@
 package stirling.software.common.model;
 
 import java.util.Calendar;
-
 import lombok.Builder;
 import lombok.Data;
 
diff --git a/common/src/main/java/stirling/software/common/model/api/GeneralFile.java b/common/src/main/java/stirling/software/common/model/api/GeneralFile.java
index 84675dcb5..ee67e53f5 100644
--- a/common/src/main/java/stirling/software/common/model/api/GeneralFile.java
+++ b/common/src/main/java/stirling/software/common/model/api/GeneralFile.java
@@ -1,11 +1,9 @@
 package stirling.software.common.model.api;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/common/src/main/java/stirling/software/common/model/api/PDFFile.java b/common/src/main/java/stirling/software/common/model/api/PDFFile.java
index 8ea3f0456..3dcceb9a4 100644
--- a/common/src/main/java/stirling/software/common/model/api/PDFFile.java
+++ b/common/src/main/java/stirling/software/common/model/api/PDFFile.java
@@ -1,12 +1,10 @@
 package stirling.software.common.model.api;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @NoArgsConstructor
diff --git a/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java b/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java
index 106d36f17..59cc09e27 100644
--- a/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java
+++ b/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.common.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java b/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java
index e0028a8ae..349363f74 100644
--- a/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java
+++ b/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java
@@ -1,7 +1,6 @@
 package stirling.software.common.model.api.security;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/common/src/main/java/stirling/software/common/model/enumeration/Role.java b/common/src/main/java/stirling/software/common/model/enumeration/Role.java
index 9e3231918..6924808a1 100644
--- a/common/src/main/java/stirling/software/common/model/enumeration/Role.java
+++ b/common/src/main/java/stirling/software/common/model/enumeration/Role.java
@@ -2,7 +2,6 @@ package stirling.software.common.model.enumeration;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
diff --git a/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java b/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java
index ef5c15497..a62eb21fb 100644
--- a/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java
+++ b/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java
@@ -2,9 +2,7 @@ package stirling.software.common.model.oauth2;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import lombok.NoArgsConstructor;
-
 import stirling.software.common.model.enumeration.UsernameAttribute;
 
 @NoArgsConstructor
diff --git a/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java b/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java
index b229ddc53..34ce9d106 100644
--- a/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java
+++ b/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java
@@ -2,9 +2,7 @@ package stirling.software.common.model.oauth2;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import lombok.NoArgsConstructor;
-
 import stirling.software.common.model.enumeration.UsernameAttribute;
 
 @NoArgsConstructor
diff --git a/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java b/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java
index 5d01fa865..420230a0e 100644
--- a/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java
+++ b/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java
@@ -2,9 +2,7 @@ package stirling.software.common.model.oauth2;
 
 import java.util.ArrayList;
 import java.util.Collection;
-
 import lombok.NoArgsConstructor;
-
 import stirling.software.common.model.enumeration.UsernameAttribute;
 
 @NoArgsConstructor
diff --git a/common/src/main/java/stirling/software/common/model/oauth2/Provider.java b/common/src/main/java/stirling/software/common/model/oauth2/Provider.java
index 55b6b4257..3c24720cc 100644
--- a/common/src/main/java/stirling/software/common/model/oauth2/Provider.java
+++ b/common/src/main/java/stirling/software/common/model/oauth2/Provider.java
@@ -5,10 +5,8 @@ import static stirling.software.common.model.enumeration.UsernameAttribute.EMAIL
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import stirling.software.common.model.enumeration.UsernameAttribute;
 import stirling.software.common.model.exception.UnsupportedClaimException;
 
diff --git a/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java b/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java
index e4b9173d0..04c8b1e28 100644
--- a/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java
+++ b/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java
@@ -8,7 +8,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.atomic.AtomicLong;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.examples.util.DeletingRandomAccessFile;
 import org.apache.pdfbox.io.IOUtils;
@@ -18,10 +19,6 @@ import org.apache.pdfbox.io.ScratchFile;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.api.PDFFile;
 
 /**
diff --git a/common/src/main/java/stirling/software/common/service/PdfMetadataService.java b/common/src/main/java/stirling/software/common/service/PdfMetadataService.java
index 621e19d46..86481b88a 100644
--- a/common/src/main/java/stirling/software/common/service/PdfMetadataService.java
+++ b/common/src/main/java/stirling/software/common/service/PdfMetadataService.java
@@ -1,12 +1,10 @@
 package stirling.software.common.service;
 
 import java.util.Calendar;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.PdfMetadata;
 
diff --git a/common/src/main/java/stirling/software/common/service/PostHogService.java b/common/src/main/java/stirling/software/common/service/PostHogService.java
index 2bc219832..16102a4e0 100644
--- a/common/src/main/java/stirling/software/common/service/PostHogService.java
+++ b/common/src/main/java/stirling/software/common/service/PostHogService.java
@@ -1,5 +1,6 @@
 package stirling.software.common.service;
 
+import com.posthog.java.PostHog;
 import java.io.File;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
@@ -16,15 +17,11 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
-
-import com.posthog.java.PostHog;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Service
diff --git a/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java b/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java
index f39daf8ae..1de2b2d20 100644
--- a/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java
+++ b/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java
@@ -3,7 +3,6 @@ package stirling.software.common.util;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 
 public class CheckProgramInstall {
diff --git a/common/src/main/java/stirling/software/common/util/EmlToPdf.java b/common/src/main/java/stirling/software/common/util/EmlToPdf.java
index 6e00b746c..2fec5e9f2 100644
--- a/common/src/main/java/stirling/software/common/util/EmlToPdf.java
+++ b/common/src/main/java/stirling/software/common/util/EmlToPdf.java
@@ -19,7 +19,10 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import lombok.Data;
+import lombok.Getter;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -35,11 +38,6 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 
 @Slf4j
@@ -49,7 +47,8 @@ public class EmlToPdf {
     private static final class StyleConstants {
         // Font and layout constants
         static final int DEFAULT_FONT_SIZE = 12;
-        static final String DEFAULT_FONT_FAMILY = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif";
+        static final String DEFAULT_FONT_FAMILY =
+                "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif";
         static final float DEFAULT_LINE_HEIGHT = 1.4f;
         static final String DEFAULT_ZOOM = "1.0";
 
@@ -76,7 +75,8 @@ public class EmlToPdf {
     }
 
     private static final class MimeConstants {
-        static final Pattern MIME_ENCODED_PATTERN = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
+        static final Pattern MIME_ENCODED_PATTERN =
+                Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
         static final String PAPERCLIP_EMOJI = "\uD83D\uDCCE"; // 📎
         static final String ATTACHMENT_ICON_PLACEHOLDER = "icon";
 
@@ -113,7 +113,8 @@ public class EmlToPdf {
         return jakartaMailAvailable;
     }
 
-    public static String convertEmlToHtml(byte[] emlBytes, EmlToPdfRequest request) throws IOException {
+    public static String convertEmlToHtml(byte[] emlBytes, EmlToPdfRequest request)
+            throws IOException {
         validateEmlInput(emlBytes);
 
         if (isJakartaMailAvailable()) {
@@ -147,11 +148,14 @@ public class EmlToPdf {
             }
 
             // Convert HTML to PDF
-            byte[] pdfBytes = convertHtmlToPdf(weasyprintPath, request, htmlContent, disableSanitize);
+            byte[] pdfBytes =
+                    convertHtmlToPdf(weasyprintPath, request, htmlContent, disableSanitize);
 
             // Attach files if available and requested
             if (shouldAttachFiles(emailContent, request)) {
-                pdfBytes = attachFilesToPdf(pdfBytes, emailContent.getAttachments(), pdfDocumentFactory);
+                pdfBytes =
+                        attachFilesToPdf(
+                                pdfBytes, emailContent.getAttachments(), pdfDocumentFactory);
             }
 
             return pdfBytes;
@@ -177,16 +181,20 @@ public class EmlToPdf {
 
     private static boolean shouldAttachFiles(EmailContent emailContent, EmlToPdfRequest request) {
         return emailContent != null
-            && request != null
-            && request.isIncludeAttachments()
-            && !emailContent.getAttachments().isEmpty();
+                && request != null
+                && request.isIncludeAttachments()
+                && !emailContent.getAttachments().isEmpty();
     }
 
-    private static byte[] convertHtmlToPdf(String weasyprintPath, EmlToPdfRequest request,
-                                         String htmlContent, boolean disableSanitize)
+    private static byte[] convertHtmlToPdf(
+            String weasyprintPath,
+            EmlToPdfRequest request,
+            String htmlContent,
+            boolean disableSanitize)
             throws IOException, InterruptedException {
 
-        stirling.software.common.model.api.converters.HTMLToPdfRequest htmlRequest = createHtmlRequest(request);
+        stirling.software.common.model.api.converters.HTMLToPdfRequest htmlRequest =
+                createHtmlRequest(request);
 
         try {
             return FileToPdf.convertHtmlToPdf(
@@ -218,8 +226,7 @@ public class EmlToPdf {
         return "attachment_" + filename.hashCode() + "_" + System.nanoTime();
     }
 
-    private static String convertEmlToHtmlBasic(
-            byte[] emlBytes, EmlToPdfRequest request) {
+    private static String convertEmlToHtmlBasic(byte[] emlBytes, EmlToPdfRequest request) {
         if (emlBytes == null || emlBytes.length == 0) {
             throw new IllegalArgumentException("EML file is empty or null");
         }
@@ -335,7 +342,6 @@ public class EmlToPdf {
             Object message =
                     mimeMessageConstructor.newInstance(session, new ByteArrayInputStream(emlBytes));
 
-
             return extractEmailContentAdvanced(message, request);
 
         } catch (ReflectiveOperationException e) {
@@ -346,8 +352,7 @@ public class EmlToPdf {
         }
     }
 
-    private static String convertEmlToHtmlAdvanced(
-            byte[] emlBytes, EmlToPdfRequest request) {
+    private static String convertEmlToHtmlAdvanced(byte[] emlBytes, EmlToPdfRequest request) {
         EmailContent content = extractEmailContentAdvanced(emlBytes, request);
         return generateEnhancedEmailHtml(content, request);
     }
@@ -479,8 +484,12 @@ public class EmlToPdf {
         // Create attachment info with paperclip emoji before filename
         attachmentInfo
                 .append("<div class=\"attachment-item\">")
-                .append("<span class=\"attachment-icon\">").append(MimeConstants.ATTACHMENT_ICON_PLACEHOLDER).append("</span> ")
-                .append("<span class=\"attachment-name\">").append(escapeHtml(filename)).append("</span>");
+                .append("<span class=\"attachment-icon\">")
+                .append(MimeConstants.ATTACHMENT_ICON_PLACEHOLDER)
+                .append("</span> ")
+                .append("<span class=\"attachment-name\">")
+                .append(escapeHtml(filename))
+                .append("</span>");
 
         // Add content type and encoding info
         if (!contentType.isEmpty() || !encoding.isEmpty()) {
@@ -503,17 +512,20 @@ public class EmlToPdf {
             String content = new String(emlBytes, 0, checkLength, StandardCharsets.UTF_8);
             String lowerContent = content.toLowerCase();
 
-            boolean hasFrom = lowerContent.contains("from:") || lowerContent.contains("return-path:");
+            boolean hasFrom =
+                    lowerContent.contains("from:") || lowerContent.contains("return-path:");
             boolean hasSubject = lowerContent.contains("subject:");
             boolean hasMessageId = lowerContent.contains("message-id:");
             boolean hasDate = lowerContent.contains("date:");
-            boolean hasTo = lowerContent.contains("to:")
-                    || lowerContent.contains("cc:")
-                    || lowerContent.contains("bcc:");
-            boolean hasMimeStructure = lowerContent.contains("multipart/")
-                    || lowerContent.contains("text/plain")
-                    || lowerContent.contains("text/html")
-                    || lowerContent.contains("boundary=");
+            boolean hasTo =
+                    lowerContent.contains("to:")
+                            || lowerContent.contains("cc:")
+                            || lowerContent.contains("bcc:");
+            boolean hasMimeStructure =
+                    lowerContent.contains("multipart/")
+                            || lowerContent.contains("text/plain")
+                            || lowerContent.contains("text/html")
+                            || lowerContent.contains("boundary=");
 
             int headerCount = 0;
             if (hasFrom) headerCount++;
@@ -684,17 +696,19 @@ public class EmlToPdf {
         html.append("  font-size: ").append(fontSize - 1).append("px;\n");
         html.append("}\n\n");
 
-
         html.append(".email-body {\n");
         html.append("  word-wrap: break-word;\n");
         html.append("}\n\n");
 
-
         html.append(".attachment-section {\n");
         html.append("  margin-top: 15px;\n");
         html.append("  padding: 10px;\n");
-        html.append("  background-color: ").append(StyleConstants.ATTACHMENT_BACKGROUND_COLOR).append(";\n");
-        html.append("  border: 1px solid ").append(StyleConstants.ATTACHMENT_BORDER_COLOR).append(";\n");
+        html.append("  background-color: ")
+                .append(StyleConstants.ATTACHMENT_BACKGROUND_COLOR)
+                .append(";\n");
+        html.append("  border: 1px solid ")
+                .append(StyleConstants.ATTACHMENT_BORDER_COLOR)
+                .append(";\n");
         html.append("  border-radius: 3px;\n");
         html.append("}\n\n");
         html.append(".attachment-section h3 {\n");
@@ -746,7 +760,6 @@ public class EmlToPdf {
         html.append("  margin-left: 8px;\n");
         html.append("}\n\n");
 
-
         // Basic image styling: ensure images are responsive but not overly constrained.
         html.append("img {\n");
         html.append("  max-width: 100%;\n"); // Make images responsive to container width
@@ -801,7 +814,9 @@ public class EmlToPdf {
             java.lang.reflect.Method getAllRecipients = messageClass.getMethod("getAllRecipients");
             Object[] recipients = (Object[]) getAllRecipients.invoke(message);
             content.setTo(
-                    recipients != null && recipients.length > 0 ? safeMimeDecode(recipients[0].toString()) : "");
+                    recipients != null && recipients.length > 0
+                            ? safeMimeDecode(recipients[0].toString())
+                            : "");
 
             java.lang.reflect.Method getSentDate = messageClass.getMethod("getSentDate");
             content.setDate((Date) getSentDate.invoke(message));
@@ -908,13 +923,14 @@ public class EmlToPdf {
                                 try {
                                     attachmentData = inputStream.readAllBytes();
                                 } catch (IOException e) {
-                                    log.warn("Failed to read InputStream attachment: {}", e.getMessage());
+                                    log.warn(
+                                            "Failed to read InputStream attachment: {}",
+                                            e.getMessage());
                                 }
                             } else if (attachmentContent instanceof byte[] byteArray) {
                                 attachmentData = byteArray;
                             } else if (attachmentContent instanceof String stringContent) {
-                                attachmentData =
-                                        stringContent.getBytes(StandardCharsets.UTF_8);
+                                attachmentData = stringContent.getBytes(StandardCharsets.UTF_8);
                             }
 
                             if (attachmentData != null) {
@@ -974,7 +990,9 @@ public class EmlToPdf {
         html.append("<div><strong>From:</strong> ")
                 .append(escapeHtml(content.getFrom()))
                 .append("</div>\n");
-        html.append("<div><strong>To:</strong> ").append(escapeHtml(content.getTo())).append("</div>\n");
+        html.append("<div><strong>To:</strong> ")
+                .append(escapeHtml(content.getTo()))
+                .append("</div>\n");
 
         if (content.getDate() != null) {
             html.append("<div><strong>Date:</strong> ")
@@ -1014,15 +1032,20 @@ public class EmlToPdf {
                                     ? attachment.getEmbeddedFilename()
                                     : attachment.getFilename());
 
-                    html.append("<div class=\"attachment-item\" id=\"").append(uniqueId).append("\">")
-                            .append("<span class=\"attachment-icon\">").append(MimeConstants.PAPERCLIP_EMOJI).append("</span> ")
+                    html.append("<div class=\"attachment-item\" id=\"")
+                            .append(uniqueId)
+                            .append("\">")
+                            .append("<span class=\"attachment-icon\">")
+                            .append(MimeConstants.PAPERCLIP_EMOJI)
+                            .append("</span> ")
                             .append("<span class=\"attachment-name\">")
                             .append(escapeHtml(safeMimeDecode(attachment.getFilename())))
                             .append("</span>");
 
                     String sizeStr = formatFileSize(attachment.getSizeBytes());
                     html.append(" <span class=\"attachment-details\">(").append(sizeStr);
-                    if (attachment.getContentType() != null && !attachment.getContentType().isEmpty()) {
+                    if (attachment.getContentType() != null
+                            && !attachment.getContentType().isEmpty()) {
                         html.append(", ").append(escapeHtml(attachment.getContentType()));
                     }
                     html.append(")</span></div>\n");
@@ -1031,8 +1054,7 @@ public class EmlToPdf {
 
             if (request.isIncludeAttachments()) {
                 html.append("<div class=\"attachment-info-note\">\n");
-                html.append(
-                        "<p><em>Attachments are embedded in the file.</em></p>\n");
+                html.append("<p><em>Attachments are embedded in the file.</em></p>\n");
                 html.append("</div>\n");
             } else {
                 html.append("<div class=\"attachment-info-note\">\n");
@@ -1050,7 +1072,10 @@ public class EmlToPdf {
         return html.toString();
     }
 
-    private static byte[] attachFilesToPdf(byte[] pdfBytes, List<EmailAttachment> attachments, stirling.software.common.service.CustomPDFDocumentFactory pdfDocumentFactory)
+    private static byte[] attachFilesToPdf(
+            byte[] pdfBytes,
+            List<EmailAttachment> attachments,
+            stirling.software.common.service.CustomPDFDocumentFactory pdfDocumentFactory)
             throws IOException {
         try (PDDocument document = pdfDocumentFactory.load(pdfBytes);
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
@@ -1104,7 +1129,8 @@ public class EmlToPdf {
 
                     // Create embedded file
                     PDEmbeddedFile embeddedFile =
-                            new PDEmbeddedFile(document, new ByteArrayInputStream(attachment.getData()));
+                            new PDEmbeddedFile(
+                                    document, new ByteArrayInputStream(attachment.getData()));
                     embeddedFile.setSize(attachment.getData().length);
                     embeddedFile.setCreationDate(new GregorianCalendar());
                     if (attachment.getContentType() != null) {
@@ -1150,11 +1176,13 @@ public class EmlToPdf {
         }
     }
 
-    private static String getUniqueFilename(String filename, List<String> embeddedFiles, Map<String, PDComplexFileSpecification> efMap) {
+    private static String getUniqueFilename(
+            String filename,
+            List<String> embeddedFiles,
+            Map<String, PDComplexFileSpecification> efMap) {
         String uniqueFilename = filename;
         int counter = 1;
-        while (embeddedFiles.contains(uniqueFilename)
-                || efMap.containsKey(uniqueFilename)) {
+        while (embeddedFiles.contains(uniqueFilename) || efMap.containsKey(uniqueFilename)) {
             String extension = "";
             String baseName = filename;
             int lastDot = filename.lastIndexOf('.');
@@ -1203,8 +1231,8 @@ public class EmlToPdf {
     }
 
     private static void addAttachmentAnnotationToPage(
-        PDDocument document, PDPage page, EmailAttachment attachment, float x, float y)
-        throws IOException {
+            PDDocument document, PDPage page, EmailAttachment attachment, float x, float y)
+            throws IOException {
 
         PDAnnotationFileAttachment fileAnnotation = new PDAnnotationFileAttachment();
 
@@ -1226,11 +1254,12 @@ public class EmlToPdf {
 
         // Set invisibility flags but keep it functional
         fileAnnotation.setInvisible(true);
-        fileAnnotation.setHidden(false);  // Must be false to remain clickable
-        fileAnnotation.setNoView(false);  // Must be false to remain clickable
+        fileAnnotation.setHidden(false); // Must be false to remain clickable
+        fileAnnotation.setNoView(false); // Must be false to remain clickable
         fileAnnotation.setPrinted(false);
 
-        PDEmbeddedFilesNameTreeNode efTree = document.getDocumentCatalog().getNames().getEmbeddedFiles();
+        PDEmbeddedFilesNameTreeNode efTree =
+                document.getDocumentCatalog().getNames().getEmbeddedFiles();
         if (efTree != null) {
             Map<String, PDComplexFileSpecification> efMap = efTree.getNames();
             if (efMap != null) {
@@ -1246,24 +1275,27 @@ public class EmlToPdf {
 
         page.getAnnotations().add(fileAnnotation);
 
-        log.info("Added attachment annotation for '{}' on page {}",
-            attachment.getFilename(), document.getPages().indexOf(page) + 1);
+        log.info(
+                "Added attachment annotation for '{}' on page {}",
+                attachment.getFilename(),
+                document.getPages().indexOf(page) + 1);
     }
 
     private static @NotNull PDRectangle getPdRectangle(PDPage page, float x, float y) {
         PDRectangle mediaBox = page.getMediaBox();
         float pdfY = mediaBox.getHeight() - y;
 
-        float iconWidth = StyleConstants.ATTACHMENT_ICON_WIDTH;  // Keep original size for clickability
-        float iconHeight = StyleConstants.ATTACHMENT_ICON_HEIGHT; // Keep original size for clickability
+        float iconWidth =
+                StyleConstants.ATTACHMENT_ICON_WIDTH; // Keep original size for clickability
+        float iconHeight =
+                StyleConstants.ATTACHMENT_ICON_HEIGHT; // Keep original size for clickability
 
         // Keep the full-size rectangle so it remains clickable
         return new PDRectangle(
-            x + StyleConstants.ANNOTATION_X_OFFSET,
-            pdfY - iconHeight + StyleConstants.ANNOTATION_Y_OFFSET,
-            iconWidth,
-            iconHeight
-        );
+                x + StyleConstants.ANNOTATION_X_OFFSET,
+                pdfY - iconHeight + StyleConstants.ANNOTATION_Y_OFFSET,
+                iconWidth,
+                iconHeight);
     }
 
     private static String formatEmailDate(Date date) {
@@ -1293,23 +1325,27 @@ public class EmlToPdf {
                 COSDictionary catalogDict = catalog.getCOSObject();
 
                 // Set PageMode to UseAttachments - this is the standard PDF specification approach
-                // PageMode values: UseNone, UseOutlines, UseThumbs, FullScreen, UseOC, UseAttachments
+                // PageMode values: UseNone, UseOutlines, UseThumbs, FullScreen, UseOC,
+                // UseAttachments
                 catalogDict.setName(COSName.PAGE_MODE, "UseAttachments");
 
                 // Also set viewer preferences for better attachment viewing experience
-                COSDictionary viewerPrefs = (COSDictionary) catalogDict.getDictionaryObject(COSName.VIEWER_PREFERENCES);
+                COSDictionary viewerPrefs =
+                        (COSDictionary) catalogDict.getDictionaryObject(COSName.VIEWER_PREFERENCES);
                 if (viewerPrefs == null) {
                     viewerPrefs = new COSDictionary();
                     catalogDict.setItem(COSName.VIEWER_PREFERENCES, viewerPrefs);
                 }
 
-                // Set NonFullScreenPageMode to UseAttachments as fallback for viewers that support it
+                // Set NonFullScreenPageMode to UseAttachments as fallback for viewers that support
+                // it
                 viewerPrefs.setName(COSName.getPDFName("NonFullScreenPageMode"), "UseAttachments");
 
                 // Additional viewer preferences that may help with attachment display
                 viewerPrefs.setBoolean(COSName.getPDFName("DisplayDocTitle"), true);
 
-                log.info("Set PDF PageMode to UseAttachments to automatically show attachments pane");
+                log.info(
+                        "Set PDF PageMode to UseAttachments to automatically show attachments pane");
             }
         } catch (Exception e) {
             // Log warning but don't fail the entire operation for viewer preferences
@@ -1391,7 +1427,7 @@ public class EmlToPdf {
                     }
                 }
                 case '_' -> // In RFC 2047, underscore represents space
-                    result.append(' ');
+                        result.append(' ');
                 default -> result.append(c);
             }
         }
@@ -1464,8 +1500,7 @@ public class EmlToPdf {
         private float y;
         private String character;
 
-        public EmojiPosition() {
-        }
+        public EmojiPosition() {}
 
         public EmojiPosition(int pageIndex, float x, float y, String character) {
             this.pageIndex = pageIndex;
@@ -1475,9 +1510,8 @@ public class EmlToPdf {
         }
     }
 
-     public static class EmojiPositionFinder extends org.apache.pdfbox.text.PDFTextStripper {
-        @Getter
-        private final List<EmojiPosition> positions = new ArrayList<>();
+    public static class EmojiPositionFinder extends org.apache.pdfbox.text.PDFTextStripper {
+        @Getter private final List<EmojiPosition> positions = new ArrayList<>();
         private int currentPageIndex;
         private boolean sortByPosition;
         private boolean isInAttachmentSection;
@@ -1503,7 +1537,9 @@ public class EmlToPdf {
         }
 
         @Override
-        protected void writeString(String string, List<org.apache.pdfbox.text.TextPosition> textPositions) throws IOException {
+        protected void writeString(
+                String string, List<org.apache.pdfbox.text.TextPosition> textPositions)
+                throws IOException {
             // Check if we are entering or exiting the attachment section
             String lowerString = string.toLowerCase();
 
@@ -1513,10 +1549,14 @@ public class EmlToPdf {
                 attachmentSectionFound = true;
             }
 
-            // Look for attachment section end markers (common patterns that indicate end of attachments)
-            if (isInAttachmentSection && (lowerString.contains("</body>") ||
-                                         lowerString.contains("</html>") ||
-                                         (attachmentSectionFound && lowerString.trim().isEmpty() && string.length() > 50))) {
+            // Look for attachment section end markers (common patterns that indicate end of
+            // attachments)
+            if (isInAttachmentSection
+                    && (lowerString.contains("</body>")
+                            || lowerString.contains("</html>")
+                            || (attachmentSectionFound
+                                    && lowerString.trim().isEmpty()
+                                    && string.length() > 50))) {
                 isInAttachmentSection = false;
             }
 
@@ -1527,17 +1567,17 @@ public class EmlToPdf {
 
                 for (int i = 0; i < string.length(); i++) {
                     // Check if we have a complete paperclip emoji at this position
-                    if (i < string.length() - 1 &&
-                        string.substring(i, i + 2).equals(paperclipEmoji) &&
-                        i < textPositions.size()) {
+                    if (i < string.length() - 1
+                            && string.substring(i, i + 2).equals(paperclipEmoji)
+                            && i < textPositions.size()) {
 
                         org.apache.pdfbox.text.TextPosition textPosition = textPositions.get(i);
-                        EmojiPosition position = new EmojiPosition(
-                            currentPageIndex,
-                            textPosition.getXDirAdj(),
-                            textPosition.getYDirAdj(),
-                            paperclipEmoji
-                        );
+                        EmojiPosition position =
+                                new EmojiPosition(
+                                        currentPageIndex,
+                                        textPosition.getXDirAdj(),
+                                        textPosition.getYDirAdj(),
+                                        paperclipEmoji);
                         positions.add(position);
                     }
                 }
@@ -1554,7 +1594,6 @@ public class EmlToPdf {
             return sortByPosition;
         }
 
-
         public void reset() {
             positions.clear();
             currentPageIndex = 0;
diff --git a/common/src/main/java/stirling/software/common/util/ErrorUtils.java b/common/src/main/java/stirling/software/common/util/ErrorUtils.java
index 75097c67e..d8738af23 100644
--- a/common/src/main/java/stirling/software/common/util/ErrorUtils.java
+++ b/common/src/main/java/stirling/software/common/util/ErrorUtils.java
@@ -2,7 +2,6 @@ package stirling.software.common.util;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
 import org.springframework.ui.Model;
 import org.springframework.web.servlet.ModelAndView;
 
diff --git a/common/src/main/java/stirling/software/common/util/FileMonitor.java b/common/src/main/java/stirling/software/common/util/FileMonitor.java
index 3d1fe4f58..8628c9de4 100644
--- a/common/src/main/java/stirling/software/common/util/FileMonitor.java
+++ b/common/src/main/java/stirling/software/common/util/FileMonitor.java
@@ -11,13 +11,10 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.RuntimePathConfig;
 
 @Component
diff --git a/common/src/main/java/stirling/software/common/util/FileToPdf.java b/common/src/main/java/stirling/software/common/util/FileToPdf.java
index 8439b67a2..132a50881 100644
--- a/common/src/main/java/stirling/software/common/util/FileToPdf.java
+++ b/common/src/main/java/stirling/software/common/util/FileToPdf.java
@@ -1,5 +1,6 @@
 package stirling.software.common.util;
 
+import io.github.pixee.security.ZipSecurity;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
@@ -13,9 +14,6 @@ import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
-
-import io.github.pixee.security.ZipSecurity;
-
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 
diff --git a/common/src/main/java/stirling/software/common/util/GeneralUtils.java b/common/src/main/java/stirling/software/common/util/GeneralUtils.java
index 3353cdfeb..b5d26876e 100644
--- a/common/src/main/java/stirling/software/common/util/GeneralUtils.java
+++ b/common/src/main/java/stirling/software/common/util/GeneralUtils.java
@@ -1,5 +1,8 @@
 package stirling.software.common.util;
 
+import com.fathzer.soft.javaluator.DoubleEvaluator;
+import io.github.pixee.security.HostValidator;
+import io.github.pixee.security.Urls;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -14,19 +17,11 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.UUID;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.web.multipart.MultipartFile;
-
-import com.fathzer.soft.javaluator.DoubleEvaluator;
-
-import io.github.pixee.security.HostValidator;
-import io.github.pixee.security.Urls;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.InstallationPathConfig;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java b/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java
index ae6c0b66f..03b9e17cf 100644
--- a/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java
+++ b/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java
@@ -1,22 +1,18 @@
 package stirling.software.common.util;
 
-import java.awt.geom.AffineTransform;
-import java.awt.image.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-import javax.imageio.ImageIO;
-
-import org.springframework.web.multipart.MultipartFile;
-
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
-
+import java.awt.geom.AffineTransform;
+import java.awt.image.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import javax.imageio.ImageIO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.multipart.MultipartFile;
 
 @Slf4j
 public class ImageProcessingUtils {
diff --git a/common/src/main/java/stirling/software/common/util/PDFToFile.java b/common/src/main/java/stirling/software/common/util/PDFToFile.java
index f763f5414..87563f7b8 100644
--- a/common/src/main/java/stirling/software/common/util/PDFToFile.java
+++ b/common/src/main/java/stirling/software/common/util/PDFToFile.java
@@ -1,5 +1,8 @@
 package stirling.software.common.util;
 
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+import io.github.pixee.security.Filenames;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,22 +15,14 @@ import java.util.List;
 import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
-
-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-import com.vladsch.flexmark.util.data.MutableDataSet;
-
-import io.github.pixee.security.Filenames;
-
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/util/PdfUtils.java b/common/src/main/java/stirling/software/common/util/PdfUtils.java
index 3986110e5..774abe078 100644
--- a/common/src/main/java/stirling/software/common/util/PdfUtils.java
+++ b/common/src/main/java/stirling/software/common/util/PdfUtils.java
@@ -1,5 +1,6 @@
 package stirling.software.common.util;
 
+import io.github.pixee.security.Filenames;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
@@ -10,10 +11,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.imageio.*;
 import javax.imageio.stream.ImageOutputStream;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -30,11 +30,6 @@ import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.service.CustomPDFDocumentFactory;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/util/ProcessExecutor.java b/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
index 09c5ff675..b250ef333 100644
--- a/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
+++ b/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
@@ -1,5 +1,6 @@
 package stirling.software.common.util;
 
+import io.github.pixee.security.BoundedLineReader;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -12,11 +13,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-
-import io.github.pixee.security.BoundedLineReader;
-
 import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/util/UrlUtils.java b/common/src/main/java/stirling/software/common/util/UrlUtils.java
index 445ef0a60..8bdf522bc 100644
--- a/common/src/main/java/stirling/software/common/util/UrlUtils.java
+++ b/common/src/main/java/stirling/software/common/util/UrlUtils.java
@@ -1,10 +1,9 @@
 package stirling.software.common.util;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.ServerSocket;
 
-import jakarta.servlet.http.HttpServletRequest;
-
 public class UrlUtils {
 
     public static String getOrigin(HttpServletRequest request) {
diff --git a/common/src/main/java/stirling/software/common/util/WebResponseUtils.java b/common/src/main/java/stirling/software/common/util/WebResponseUtils.java
index 62a0e3246..2af95a594 100644
--- a/common/src/main/java/stirling/software/common/util/WebResponseUtils.java
+++ b/common/src/main/java/stirling/software/common/util/WebResponseUtils.java
@@ -1,10 +1,10 @@
 package stirling.software.common.util;
 
+import io.github.pixee.security.Filenames;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -12,8 +12,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 
-import io.github.pixee.security.Filenames;
-
 public class WebResponseUtils {
 
     public static ResponseEntity<byte[]> boasToWebResponse(
diff --git a/common/src/main/java/stirling/software/common/util/YamlHelper.java b/common/src/main/java/stirling/software/common/util/YamlHelper.java
index 4de2bd597..b30fcfe40 100644
--- a/common/src/main/java/stirling/software/common/util/YamlHelper.java
+++ b/common/src/main/java/stirling/software/common/util/YamlHelper.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-
+import lombok.extern.slf4j.Slf4j;
 import org.snakeyaml.engine.v2.api.Dump;
 import org.snakeyaml.engine.v2.api.DumpSettings;
 import org.snakeyaml.engine.v2.api.LoadSettings;
@@ -30,8 +30,6 @@ import org.snakeyaml.engine.v2.nodes.Tag;
 import org.snakeyaml.engine.v2.parser.ParserImpl;
 import org.snakeyaml.engine.v2.scanner.StreamReader;
 
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 public class YamlHelper {
 
diff --git a/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java b/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java
index dc1781236..688312bd8 100644
--- a/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java
+++ b/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Set;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -21,9 +21,6 @@ import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.apache.pdfbox.text.TextPosition;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
 
diff --git a/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java b/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java
index df40737d3..9b374457a 100644
--- a/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java
+++ b/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java
@@ -7,9 +7,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-
 import javax.imageio.ImageIO;
-
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -18,7 +16,6 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
-
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
 
 public class InvertFullColorStrategy extends ReplaceAndInvertColorStrategy {
diff --git a/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java b/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java
index 5e140ace6..9578596cc 100644
--- a/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java
+++ b/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java
@@ -3,7 +3,6 @@ package stirling.software.common.util.misc;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.List;
-
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.text.PDFTextStripperByArea;
 import org.apache.pdfbox.text.TextPosition;
diff --git a/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java b/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java
index 5bb87b343..a5f4ed8ae 100644
--- a/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java
+++ b/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java
@@ -1,13 +1,10 @@
 package stirling.software.common.util.misc;
 
 import java.io.IOException;
-
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.web.multipart.MultipartFile;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
 
diff --git a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java b/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java
index 98cba7e8c..f28407ddb 100644
--- a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java
+++ b/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java
@@ -1,15 +1,12 @@
 package stirling.software.common.util.propertyeditor;
 
-import java.beans.PropertyEditorSupport;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
+import java.beans.PropertyEditorSupport;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.api.security.RedactionArea;
 
 @Slf4j
diff --git a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java b/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java
index 4a9afc2f6..4ebfe4c34 100644
--- a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java
+++ b/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java
@@ -1,11 +1,10 @@
 package stirling.software.common.util.propertyeditor;
 
-import java.beans.PropertyEditorSupport;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.beans.PropertyEditorSupport;
+import java.util.HashMap;
+import java.util.Map;
 
 public class StringToMapPropertyEditor extends PropertyEditorSupport {
 
diff --git a/proprietary/build.gradle b/proprietary/build.gradle
index 6a5730f84..716e145be 100644
--- a/proprietary/build.gradle
+++ b/proprietary/build.gradle
@@ -4,6 +4,12 @@ repositories {
 bootRun {
     enabled = false
 }
+spotless {
+    java {
+        target sourceSets.main.allJava
+        googleJavaFormat(googleJavaFormatVersion).aosp()
+    }
+}
 dependencies {
     implementation project(':common')
 
@@ -17,18 +23,17 @@ dependencies {
     api 'org.springframework.boot:spring-boot-starter-data-jpa'
     api 'org.springframework.boot:spring-boot-starter-oauth2-client'
     api 'org.springframework.boot:spring-boot-starter-mail'
-    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.30'
-    api 'org.springframework.boot:spring-boot-starter-validation'
+    api 'io.swagger.core.v3:swagger-core-jakarta:2.2.33'
     implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0'
 
     // https://mvnrepository.com/artifact/com.bucket4j/bucket4j_jdk17
-    implementation 'org.bouncycastle:bcprov-jdk18on:1.80'
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.81'
 
     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE'
     api 'io.micrometer:micrometer-registry-prometheus'
     implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
     runtimeOnly 'com.h2database:h2:2.3.232' // Don't upgrade h2database
-    runtimeOnly 'org.postgresql:postgresql:42.7.5'
+    runtimeOnly 'org.postgresql:postgresql:42.7.7'
     constraints {
         implementation "org.opensaml:opensaml-core:$openSamlVersion"
         implementation "org.opensaml:opensaml-saml-api:$openSamlVersion"
diff --git a/proprietary/src/main/java/stirling/software/proprietary/model/Team.java b/proprietary/src/main/java/stirling/software/proprietary/model/Team.java
index 5157b3233..7d9533a16 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/model/Team.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/model/Team.java
@@ -1,13 +1,10 @@
 package stirling.software.proprietary.model;
 
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
-
-import jakarta.persistence.*;
-
 import lombok.*;
-
 import stirling.software.proprietary.security.model.User;
 
 @Entity
diff --git a/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java b/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java
index 53e66993a..ae3213f7e 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java
@@ -1,6 +1,5 @@
 package stirling.software.proprietary.model.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java
index d9fe1ff94..3be32c367 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java
@@ -1,10 +1,13 @@
 package stirling.software.proprietary.security;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.InternalAuthenticationServiceException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java
index 4e8df9bb7..24e0a6bbf 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java
@@ -1,5 +1,4 @@
 package stirling.software.proprietary.security;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -12,9 +11,11 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-
+import java.io.IOException;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.SavedRequest;
 import stirling.software.common.util.RequestUriUtils;
 import stirling.software.proprietary.audit.AuditEventType;
 import stirling.software.proprietary.audit.AuditLevel;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java
index 033ea913c..8aa47a7fa 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java
@@ -1,27 +1,22 @@
 package stirling.software.proprietary.security;
 
+import com.coveo.saml.SamlClient;
+import com.coveo.saml.SamlException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 import java.util.ArrayList;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-
-import com.coveo.saml.SamlClient;
-import com.coveo.saml.SamlException;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java b/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
index ffe115f23..306ffab2f 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java
@@ -1,17 +1,13 @@
 package stirling.software.proprietary.security;
 
+import jakarta.annotation.PostConstruct;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-
-import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PostConstruct;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.stereotype.Component;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java b/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java
index 25b3c5096..4faeb9041 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java
@@ -1,10 +1,8 @@
 package stirling.software.proprietary.security;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.proprietary.security.filter.IPRateLimitingFilter;
 
 @Component
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
index 836b661eb..9ea537e23 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
@@ -2,6 +2,10 @@ package stirling.software.proprietary.security.config;
 
 import static stirling.software.common.util.ProviderUtils.validateProvider;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -10,7 +14,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
@@ -19,16 +23,6 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
@@ -239,7 +233,8 @@ public class AccountWebController {
                 }
 
                 // Also check if user is part of the Internal team
-                if (user.getTeam() != null && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
+                if (user.getTeam() != null
+                        && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
                     shouldRemove = true;
                 }
 
@@ -336,6 +331,9 @@ public class AccountWebController {
                         case "userNotFound" -> "userNotFoundMessage";
                         case "downgradeCurrentUser" -> "downgradeCurrentUserMessage";
                         case "disabledCurrentUser" -> "disabledCurrentUserMessage";
+                        case "cannotMoveInternalUsers" -> "team.cannotMoveInternalUsers";
+                        case "internalTeamNotAccessible" -> "team.internalTeamNotAccessible";
+                        case "invalidRole" -> "invalidRoleMessage";
                         default -> messageType;
                     };
             model.addAttribute("changeMessage", changeMessage);
@@ -351,10 +349,16 @@ public class AccountWebController {
         model.addAttribute("disabledUsers", disabledUsers);
 
         // Get all teams but filter out the Internal team
-        List<Team> allTeams = teamRepository.findAll()
-                .stream()
-                .filter(team -> !team.getName().equals(stirling.software.proprietary.security.service.TeamService.INTERNAL_TEAM_NAME))
-                .toList();
+        List<Team> allTeams =
+                teamRepository.findAll().stream()
+                        .filter(
+                                team ->
+                                        !team.getName()
+                                                .equals(
+                                                        stirling.software.proprietary.security
+                                                                .service.TeamService
+                                                                .INTERNAL_TEAM_NAME))
+                        .toList();
         model.addAttribute("teams", allTeams);
 
         model.addAttribute("maxPaidUsers", applicationProperties.getPremium().getMaxUsers());
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
index e6afa6e40..cc8f40556 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java
@@ -1,7 +1,8 @@
 package stirling.software.proprietary.security.configuration;
 
 import javax.sql.DataSource;
-
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -11,10 +12,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
index c9b6e9d77..43bb83511 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
@@ -1,16 +1,13 @@
 package stirling.software.proprietary.security.configuration;
 
 import java.util.Properties;
-
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 
 /**
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
index ab809a037..c75ba4f4e 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
@@ -1,7 +1,7 @@
 package stirling.software.proprietary.security.configuration;
 
 import java.util.Optional;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -27,9 +27,6 @@ import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.proprietary.security.CustomAuthenticationFailureHandler;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
index b299f5d73..7fd375dd8 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java
@@ -8,7 +8,6 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Profile;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.EnterpriseEdition;
 import stirling.software.common.model.ApplicationProperties.Premium;
@@ -81,9 +80,9 @@ public class EEAppConfig {
 
         // Copy the license key if it's set in enterprise but not in premium
         if (premium.getKey() == null
-                || premium.getKey().equals("00000000-0000-0000-0000-000000000000")) {
+                || "00000000-0000-0000-0000-000000000000".equals(premium.getKey())) {
             if (enterpriseEdition.getKey() != null
-                    && !enterpriseEdition.getKey().equals("00000000-0000-0000-0000-000000000000")) {
+                    && !"00000000-0000-0000-0000-000000000000".equals(enterpriseEdition.getKey())) {
                 premium.setKey(enterpriseEdition.getKey());
             }
         }
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java
index 969385a33..f4d0bae69 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java
@@ -1,24 +1,20 @@
 package stirling.software.proprietary.security.configuration.ee;
 
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.Base64;
-
-import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
-import org.bouncycastle.crypto.signers.Ed25519Signer;
-import org.bouncycastle.util.encoders.Hex;
-import org.springframework.stereotype.Service;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.posthog.java.shaded.org.json.JSONException;
 import com.posthog.java.shaded.org.json.JSONObject;
-
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Base64;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters;
+import org.bouncycastle.crypto.signers.Ed25519Signer;
+import org.bouncycastle.util.encoders.Hex;
+import org.springframework.stereotype.Service;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java
index 15baef7db..14a69d991 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java
@@ -4,12 +4,9 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java
index dec64c46f..6bc4a091c 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java
@@ -1,12 +1,17 @@
 package stirling.software.proprietary.security.controller.api;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.http.HttpStatus;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.core.io.InputStreamResource;
@@ -18,15 +23,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.proprietary.security.database.H2SQLCondition;
 import stirling.software.proprietary.security.service.DatabaseService;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java
index 7fb767573..d691a89a2 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java
@@ -1,5 +1,11 @@
 package stirling.software.proprietary.security.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.mail.MessagingException;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -8,16 +14,6 @@ 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.mail.MessagingException;
-import jakarta.validation.Valid;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.proprietary.security.model.api.Email;
 import stirling.software.proprietary.security.service.EmailService;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java
index 9c77af94a..57b9c7a17 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java
@@ -1,19 +1,14 @@
 package stirling.software.proprietary.security.controller.api;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.transaction.Transactional;
 import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.view.RedirectView;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.transaction.Transactional;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.proprietary.model.Team;
 import stirling.software.proprietary.security.config.PremiumEndpoint;
 import stirling.software.proprietary.security.database.repository.UserRepository;
@@ -36,12 +31,12 @@ public class TeamController {
     @PostMapping("/create")
     public RedirectView createTeam(@RequestParam("name") String name) {
         if (teamRepository.existsByNameIgnoreCase(name)) {
-            return new RedirectView("/adminSettings?messageType=teamExists");
+            return new RedirectView("/teams?messageType=teamExists");
         }
         Team team = new Team();
         team.setName(name);
         teamRepository.save(team);
-        return new RedirectView("/adminSettings?messageType=teamCreated");
+        return new RedirectView("/teams?messageType=teamCreated");
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -50,21 +45,21 @@ public class TeamController {
             @RequestParam("teamId") Long teamId, @RequestParam("newName") String newName) {
         Optional<Team> existing = teamRepository.findById(teamId);
         if (existing.isEmpty()) {
-            return new RedirectView("/adminSettings?messageType=teamNotFound");
+            return new RedirectView("/teams?messageType=teamNotFound");
         }
         if (teamRepository.existsByNameIgnoreCase(newName)) {
-            return new RedirectView("/adminSettings?messageType=teamNameExists");
+            return new RedirectView("/teams?messageType=teamNameExists");
         }
         Team team = existing.get();
 
         // Prevent renaming the Internal team
         if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return new RedirectView("/adminSettings?messageType=internalTeamNotAccessible");
+            return new RedirectView("/teams?messageType=internalTeamNotAccessible");
         }
 
         team.setName(newName);
         teamRepository.save(team);
-        return new RedirectView("/adminSettings?messageType=teamRenamed");
+        return new RedirectView("/teams?messageType=teamRenamed");
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -73,35 +68,36 @@ public class TeamController {
     public RedirectView deleteTeam(@RequestParam("teamId") Long teamId) {
         Optional<Team> teamOpt = teamRepository.findById(teamId);
         if (teamOpt.isEmpty()) {
-            return new RedirectView("/adminSettings?messageType=teamNotFound");
+            return new RedirectView("/teams?messageType=teamNotFound");
         }
 
         Team team = teamOpt.get();
 
         // Prevent deleting the Internal team
         if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
-            return new RedirectView("/adminSettings?messageType=internalTeamNotAccessible");
+            return new RedirectView("/teams?messageType=internalTeamNotAccessible");
         }
 
         long memberCount = userRepository.countByTeam(team);
         if (memberCount > 0) {
-            return new RedirectView("/adminSettings?messageType=teamHasUsers");
+            return new RedirectView("/teams?messageType=teamHasUsers");
         }
 
         teamRepository.delete(team);
-        return new RedirectView("/adminSettings?messageType=teamDeleted");
+        return new RedirectView("/teams?messageType=teamDeleted");
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/addUser")
     @Transactional
     public RedirectView addUserToTeam(
-            @RequestParam("teamId") Long teamId,
-            @RequestParam("userId") Long userId) {
+            @RequestParam("teamId") Long teamId, @RequestParam("userId") Long userId) {
 
         // Find the team
-        Team team = teamRepository.findById(teamId)
-                .orElseThrow(() -> new RuntimeException("Team not found"));
+        Team team =
+                teamRepository
+                        .findById(teamId)
+                        .orElseThrow(() -> new RuntimeException("Team not found"));
 
         // Prevent adding users to the Internal team
         if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
@@ -109,11 +105,14 @@ public class TeamController {
         }
 
         // Find the user
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new RuntimeException("User not found"));
+        User user =
+                userRepository
+                        .findById(userId)
+                        .orElseThrow(() -> new RuntimeException("User not found"));
 
         // Check if user is in the Internal team - prevent moving them
-        if (user.getTeam() != null && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
+        if (user.getTeam() != null
+                && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
             return new RedirectView("/teams/" + teamId + "?error=cannotMoveInternalUsers");
         }
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
index 0499fe01b..d2ce0d774 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
@@ -1,12 +1,17 @@
 package stirling.software.proprietary.security.controller.api;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.security.Principal;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,16 +25,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.servlet.view.RedirectView;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.transaction.Transactional;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
@@ -57,6 +52,7 @@ public class UserController {
     private final ApplicationProperties applicationProperties;
     private final TeamRepository teamRepository;
     private final UserRepository userRepository;
+
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
     public String register(@ModelAttribute UsernameAndPass requestModel, Model model)
@@ -250,15 +246,18 @@ public class UserController {
         // Use teamId if provided, otherwise use default team
         Long effectiveTeamId = teamId;
         if (effectiveTeamId == null) {
-            Team defaultTeam = teamRepository.findByName(TeamService.DEFAULT_TEAM_NAME).orElse(null);
+            Team defaultTeam =
+                    teamRepository.findByName(TeamService.DEFAULT_TEAM_NAME).orElse(null);
             if (defaultTeam != null) {
                 effectiveTeamId = defaultTeam.getId();
             }
         } else {
             // Check if the selected team is Internal - prevent assigning to it
             Team selectedTeam = teamRepository.findById(effectiveTeamId).orElse(null);
-            if (selectedTeam != null && TeamService.INTERNAL_TEAM_NAME.equals(selectedTeam.getName())) {
-                return new RedirectView("/adminSettings?messageType=internalTeamNotAccessible", true);
+            if (selectedTeam != null
+                    && TeamService.INTERNAL_TEAM_NAME.equals(selectedTeam.getName())) {
+                return new RedirectView(
+                        "/adminSettings?messageType=internalTeamNotAccessible", true);
             }
         }
 
@@ -316,12 +315,15 @@ public class UserController {
             if (team != null) {
                 // Prevent assigning to Internal team
                 if (TeamService.INTERNAL_TEAM_NAME.equals(team.getName())) {
-                    return new RedirectView("/adminSettings?messageType=internalTeamNotAccessible", true);
+                    return new RedirectView(
+                            "/adminSettings?messageType=internalTeamNotAccessible", true);
                 }
 
                 // Prevent moving users from Internal team
-                if (user.getTeam() != null && TeamService.INTERNAL_TEAM_NAME.equals(user.getTeam().getName())) {
-                    return new RedirectView("/adminSettings?messageType=cannotMoveInternalUsers", true);
+                if (user.getTeam() != null
+                        && TeamService.INTERNAL_TEAM_NAME.equals(user.getTeam().getName())) {
+                    return new RedirectView(
+                            "/adminSettings?messageType=cannotMoveInternalUsers", true);
                 }
 
                 user.setTeam(team);
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java
index 940c0c13f..0915c704c 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java
@@ -1,19 +1,14 @@
 package stirling.software.proprietary.security.controller.web;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.FileInfo;
 import stirling.software.proprietary.security.service.DatabaseService;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java
index d41b2aa75..9e5b8bb84 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java
@@ -1,20 +1,18 @@
 package stirling.software.proprietary.security.controller.web;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.proprietary.model.Team;
 import stirling.software.proprietary.model.dto.TeamWithUserCountDTO;
 import stirling.software.proprietary.security.database.repository.SessionRepository;
@@ -35,14 +33,15 @@ public class TeamWebController {
 
     @GetMapping
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    public String listTeams(Model model) {
+    public String listTeams(HttpServletRequest request, Model model) {
         // Get teams with user counts using a DTO projection
         List<TeamWithUserCountDTO> allTeamsWithCounts = teamRepository.findAllTeamsWithUserCount();
 
         // Filter out the Internal team
-        List<TeamWithUserCountDTO> teamsWithCounts = allTeamsWithCounts.stream()
-                .filter(team -> !team.getName().equals(TeamService.INTERNAL_TEAM_NAME))
-                .toList();
+        List<TeamWithUserCountDTO> teamsWithCounts =
+                allTeamsWithCounts.stream()
+                        .filter(team -> !team.getName().equals(TeamService.INTERNAL_TEAM_NAME))
+                        .toList();
 
         // Get the latest activity for each team
         List<Object[]> teamActivities = sessionRepository.findLatestActivityByTeam();
@@ -55,6 +54,27 @@ public class TeamWebController {
             teamLastRequest.put(teamId, lastActivity);
         }
 
+        String messageType = request.getParameter("messageType");
+        if (messageType != null) {
+            if ("teamCreated".equals(messageType)) {
+                model.addAttribute("addMessage", "teamCreated");
+            } else if ("teamExists".equals(messageType)) {
+                model.addAttribute("errorMessage", "teamExists");
+            } else if ("teamNotFound".equals(messageType)) {
+                model.addAttribute("errorMessage", "teamNotFound");
+            } else if ("teamNameExists".equals(messageType)) {
+                model.addAttribute("errorMessage", "teamNameExists");
+            } else if ("internalTeamNotAccessible".equals(messageType)) {
+                model.addAttribute("errorMessage", "team.internalTeamNotAccessible");
+            } else if ("teamRenamed".equals(messageType)) {
+                model.addAttribute("changeMessage", "teamRenamed");
+            } else if ("teamHasUsers".equals(messageType)) {
+                model.addAttribute("errorMessage", "teamHasUsers");
+            } else if ("teamDeleted".equals(messageType)) {
+                model.addAttribute("deleteMessage", "teamDeleted");
+            }
+        }
+
         // Add data to the model
         model.addAttribute("teamsWithCounts", teamsWithCounts);
         model.addAttribute("teamLastRequest", teamLastRequest);
@@ -64,10 +84,13 @@ public class TeamWebController {
 
     @GetMapping("/{id}")
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    public String viewTeamDetails(@PathVariable("id") Long id, Model model) {
+    public String viewTeamDetails(
+            HttpServletRequest request, @PathVariable("id") Long id, Model model) {
         // Get the team
-        Team team = teamRepository.findById(id)
-                .orElseThrow(() -> new RuntimeException("Team not found"));
+        Team team =
+                teamRepository
+                        .findById(id)
+                        .orElseThrow(() -> new RuntimeException("Team not found"));
 
         // Prevent access to Internal team
         if (team.getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
@@ -80,10 +103,19 @@ public class TeamWebController {
         // Get all users not in this team for the Add User to Team dropdown
         // Exclude users that are in the Internal team
         List<User> allUsers = userRepository.findAllWithTeam();
-        List<User> availableUsers = allUsers.stream()
-                .filter(user -> (user.getTeam() == null || !user.getTeam().getId().equals(id)) &&
-                               (user.getTeam() == null || !user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)))
-                .toList();
+        List<User> availableUsers =
+                allUsers.stream()
+                        .filter(
+                                user ->
+                                        (user.getTeam() == null
+                                                        || !user.getTeam().getId().equals(id))
+                                                && (user.getTeam() == null
+                                                        || !user.getTeam()
+                                                                .getName()
+                                                                .equals(
+                                                                        TeamService
+                                                                                .INTERNAL_TEAM_NAME)))
+                        .toList();
 
         // Get the latest session for each user in the team
         List<Object[]> userSessions = sessionRepository.findLatestSessionByTeamId(id);
@@ -96,6 +128,13 @@ public class TeamWebController {
             userLastRequest.put(username, lastRequest);
         }
 
+        String errorMessage = request.getParameter("error");
+        if (errorMessage != null) {
+            if ("cannotMoveInternalUsers".equals(errorMessage)) {
+                model.addAttribute("errorMessage", "team.cannotMoveInternalUsers");
+            }
+        }
+
         model.addAttribute("team", team);
         model.addAttribute("teamUsers", teamUsers);
         model.addAttribute("availableUsers", availableUsers);
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java
index 6821414aa..835dc1917 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java
@@ -1,13 +1,10 @@
 package stirling.software.proprietary.security.database;
 
 import java.sql.SQLException;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.exception.UnsupportedProviderException;
 import stirling.software.proprietary.security.service.DatabaseServiceInterface;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java
index e8d74ec01..32018ca98 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java
@@ -1,10 +1,8 @@
 package stirling.software.proprietary.security.database.repository;
 
 import java.util.Set;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
 import stirling.software.proprietary.security.model.Authority;
 
 @Repository
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java
index ec7a0078b..f849454db 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java
@@ -1,11 +1,9 @@
 package stirling.software.proprietary.security.database.repository;
 
 import java.util.Date;
-
 import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
 import org.springframework.transaction.annotation.Transactional;
-
 import stirling.software.proprietary.security.model.PersistentLogin;
 
 public class JPATokenRepositoryImpl implements PersistentTokenRepository {
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java
index 2ab956676..a9ddf8a37 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java
@@ -2,7 +2,6 @@ package stirling.software.proprietary.security.database.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-
 import stirling.software.proprietary.security.model.PersistentLogin;
 
 @Repository
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java
index 3eb1ad90b..f764c7753 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java
@@ -1,16 +1,13 @@
 package stirling.software.proprietary.security.database.repository;
 
+import jakarta.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-
-import jakarta.transaction.Transactional;
-
 import stirling.software.proprietary.security.model.SessionEntity;
 
 @Repository
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java
index a53eed6d1..4f4f2e98c 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java
@@ -2,12 +2,10 @@ package stirling.software.proprietary.security.database.repository;
 
 import java.util.List;
 import java.util.Optional;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-
 import stirling.software.proprietary.model.Team;
 import stirling.software.proprietary.security.model.User;
 
@@ -30,7 +28,8 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Query(value = "SELECT u FROM User u LEFT JOIN FETCH u.team")
     List<User> findAllWithTeam();
 
-    @Query("SELECT u FROM User u JOIN FETCH u.authorities JOIN FETCH u.team WHERE u.team.id = :teamId")
+    @Query(
+            "SELECT u FROM User u JOIN FETCH u.authorities JOIN FETCH u.team WHERE u.team.id = :teamId")
     List<User> findAllByTeamId(@Param("teamId") Long teamId);
 
     long countByTeam(Team team);
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java b/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java
index 5ee61f8ff..91a62d646 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java
@@ -1,16 +1,14 @@
 package stirling.software.proprietary.security.filter;
 
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
 
 @Component
 public class EnterpriseEndpointFilter extends OncePerRequestFilter {
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java b/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java
index 3bae72195..a96e6e769 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java
@@ -1,24 +1,20 @@
 package stirling.software.proprietary.security.filter;
 
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Optional;
-
-import org.springframework.context.annotation.Lazy;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
 import stirling.software.common.util.RequestUriUtils;
 import stirling.software.proprietary.security.model.User;
 import stirling.software.proprietary.security.service.UserService;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java b/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java
index 028768c08..ebc0f949e 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java
@@ -1,18 +1,15 @@
 package stirling.software.proprietary.security.filter;
 
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
-
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.util.RequestUriUtils;
 
 @RequiredArgsConstructor
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java b/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
index e9addd239..de97ec785 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
@@ -1,9 +1,13 @@
 package stirling.software.proprietary.security.filter;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
@@ -16,14 +20,6 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java b/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java
index 4d1d7bbed..31db979b0 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java
@@ -1,10 +1,17 @@
 package stirling.software.proprietary.security.filter;
 
+import io.github.bucket4j.Bandwidth;
+import io.github.bucket4j.Bucket;
+import io.github.bucket4j.ConsumptionProbe;
+import io.github.pixee.security.Newlines;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
@@ -13,17 +20,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-
-import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket;
-import io.github.bucket4j.ConsumptionProbe;
-import io.github.pixee.security.Newlines;
-
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 import stirling.software.common.model.enumeration.Role;
 
 @Component
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java
index 1db14aaaf..adc0a52c0 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.model;
 
 import java.util.Collection;
-
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java
index 382d3a71e..9f998e070 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java
@@ -1,7 +1,5 @@
 package stirling.software.proprietary.security.model;
 
-import java.io.Serializable;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -10,7 +8,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
+import java.io.Serializable;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java
index ef096f7fb..aed62a749 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java
@@ -1,12 +1,10 @@
 package stirling.software.proprietary.security.model;
 
-import java.util.Date;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
+import java.util.Date;
 import lombok.Data;
 
 @Entity
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java
index db94eae6f..c39b2e674 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java
@@ -1,12 +1,10 @@
 package stirling.software.proprietary.security.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
+import java.io.Serializable;
+import java.util.Date;
 import lombok.Data;
 
 @Entity
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
index d3e232f61..200b0fb3b 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
@@ -1,20 +1,17 @@
 package stirling.software.proprietary.security.model;
 
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import jakarta.persistence.*;
-
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.proprietary.model.Team;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java
index 4e9421aba..c8ca3891f 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java
@@ -1,13 +1,10 @@
 package stirling.software.proprietary.security.model.api;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import stirling.software.common.model.api.GeneralFile;
 
 @Data
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java
index 3f630f61d..1335f5243 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.model.api.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java
index d158e6b32..b3895cfd8 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.model.api.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java
index c5fd081f6..4d65d226c 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.model.api.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java
index 0a21cba87..a3d870159 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.model.api.user;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java
index 7175a5b5d..92b053b8a 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java
@@ -1,7 +1,10 @@
 package stirling.software.proprietary.security.oauth2;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.LockedException;
@@ -10,12 +13,6 @@ import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 public class CustomOAuth2AuthenticationFailureHandler
         extends SimpleUrlAuthenticationFailureHandler {
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
index 71bd42a85..1c4d04e55 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
@@ -1,22 +1,18 @@
 package stirling.software.proprietary.security.oauth2;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import java.io.IOException;
 import java.sql.SQLException;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.security.web.savedrequest.SavedRequest;
-
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
index 6516cc7d7..13c90d7af 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
@@ -9,7 +9,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -23,9 +23,6 @@ import org.springframework.security.oauth2.client.registration.ClientRegistratio
 import org.springframework.security.oauth2.client.registration.ClientRegistrations;
 import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
 import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2.Client;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java b/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java
index 691b41e18..c3571b447 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java
@@ -2,12 +2,9 @@ package stirling.software.proprietary.security.repository;
 
 import java.util.List;
 import java.util.Optional;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-
 import stirling.software.proprietary.model.Team;
 import stirling.software.proprietary.model.dto.TeamWithUserCountDTO;
 
@@ -15,8 +12,9 @@ import stirling.software.proprietary.model.dto.TeamWithUserCountDTO;
 public interface TeamRepository extends JpaRepository<Team, Long> {
     Optional<Team> findByName(String name);
 
-    @Query("SELECT new stirling.software.proprietary.model.dto.TeamWithUserCountDTO(t.id, t.name, COUNT(u)) " +
-           "FROM Team t LEFT JOIN t.users u GROUP BY t.id, t.name")
+    @Query(
+            "SELECT new stirling.software.proprietary.model.dto.TeamWithUserCountDTO(t.id, t.name, COUNT(u)) "
+                    + "FROM Team t LEFT JOIN t.users u GROUP BY t.id, t.name")
     List<TeamWithUserCountDTO> findAllTeamsWithUserCount();
 
     boolean existsByNameIgnoreCase(String name);
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java
index fff03fd4f..c2957e241 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java
@@ -6,7 +6,6 @@ import java.nio.charset.StandardCharsets;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
-
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.openssl.PEMKeyPair;
 import org.bouncycastle.openssl.PEMParser;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java
index a39a39092..055ac8f4e 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java
@@ -3,7 +3,6 @@ package stirling.software.proprietary.security.saml2;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java
index 7bf0c3a3b..a7e663aac 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java
@@ -1,7 +1,9 @@
 package stirling.software.proprietary.security.saml2;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.security.authentication.ProviderNotFoundException;
 import org.springframework.security.core.AuthenticationException;
@@ -9,11 +11,6 @@ import org.springframework.security.saml2.core.Saml2Error;
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationException;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-
 @Slf4j
 @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true")
 public class CustomSaml2AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
index 2170a9632..47391e4d0 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
@@ -1,21 +1,17 @@
 package stirling.software.proprietary.security.saml2;
 
-import java.io.IOException;
-import java.sql.SQLException;
-
-import org.springframework.security.authentication.LockedException;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-import org.springframework.security.web.savedrequest.SavedRequest;
-
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-
+import java.io.IOException;
+import java.sql.SQLException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.SavedRequest;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java
index e8326c1e3..d1c24b420 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java
@@ -5,7 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.core.Assertion;
 import org.opensaml.saml.saml2.core.Attribute;
@@ -16,10 +17,6 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider.ResponseToken;
 import org.springframework.security.saml2.provider.service.authentication.Saml2Authentication;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.proprietary.security.model.User;
 import stirling.software.proprietary.security.service.UserService;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java
index 7fd4768b3..8482b8753 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java
@@ -1,9 +1,11 @@
 package stirling.software.proprietary.security.saml2;
 
+import jakarta.servlet.http.HttpServletRequest;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.UUID;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -18,12 +20,6 @@ import org.springframework.security.saml2.provider.service.registration.RelyingP
 import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding;
 import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository;
 import org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java
index 19e300585..5687a3b92 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java
@@ -1,13 +1,10 @@
 package stirling.software.proprietary.security.service;
 
 import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.configuration.interfaces.ShowAdminInterface;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.proprietary.security.database.repository.UserRepository;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java
index 0b286e894..b889a06e5 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java
@@ -1,7 +1,7 @@
 package stirling.software.proprietary.security.service;
 
 import java.util.Optional;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -10,9 +10,6 @@ import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
 import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.common.model.enumeration.UsernameAttribute;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
index 6ece48a4e..014666971 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java
@@ -2,7 +2,7 @@ package stirling.software.proprietary.security.service;
 
 import java.util.Collection;
 import java.util.Set;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -10,9 +10,6 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.proprietary.security.database.repository.UserRepository;
 import stirling.software.proprietary.security.model.Authority;
 import stirling.software.proprietary.security.model.User;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java
index 6474ae7ea..00967f821 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java
@@ -18,15 +18,11 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javax.sql.DataSource;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.datasource.init.CannotReadScriptException;
 import org.springframework.jdbc.datasource.init.ScriptException;
 import org.springframework.stereotype.Service;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.FileInfo;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java
index 613432f0a..17035094e 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java
@@ -2,7 +2,6 @@ package stirling.software.proprietary.security.service;
 
 import java.sql.SQLException;
 import java.util.List;
-
 import stirling.software.common.model.FileInfo;
 import stirling.software.common.model.exception.UnsupportedProviderException;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
index 08860a340..79506c25a 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
@@ -1,17 +1,14 @@
 package stirling.software.proprietary.security.service;
 
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.proprietary.security.model.api.Email;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java
index ecc04bac5..852fc8ab9 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java
@@ -1,15 +1,11 @@
 package stirling.software.proprietary.security.service;
 
+import jakarta.annotation.PostConstruct;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
-
-import org.springframework.stereotype.Service;
-
-import jakarta.annotation.PostConstruct;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.stereotype.Service;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.proprietary.security.model.AttemptCounter;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java
index 194a2a967..102301924 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java
@@ -1,9 +1,7 @@
 package stirling.software.proprietary.security.service;
 
-import org.springframework.stereotype.Service;
-
 import lombok.RequiredArgsConstructor;
-
+import org.springframework.stereotype.Service;
 import stirling.software.proprietary.model.Team;
 import stirling.software.proprietary.security.repository.TeamRepository;
 
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java b/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java
index 50c8027f6..d365cf58a 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java
@@ -9,7 +9,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Supplier;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -24,10 +25,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.enumeration.Role;
 import stirling.software.common.model.exception.UnsupportedProviderException;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java b/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java
index b69dfaefb..a0487381f 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java
@@ -1,11 +1,9 @@
 package stirling.software.proprietary.security.session;
 
-import org.springframework.stereotype.Component;
-
 import jakarta.servlet.http.HttpSessionEvent;
 import jakarta.servlet.http.HttpSessionListener;
-
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java
index 8931866ad..5d482e94d 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java
@@ -1,5 +1,6 @@
 package stirling.software.proprietary.security.session;
 
+import jakarta.transaction.Transactional;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,18 +8,13 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Component;
-
-import jakarta.transaction.Transactional;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.proprietary.security.database.repository.SessionRepository;
 import stirling.software.proprietary.security.model.SessionEntity;
 import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal;
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java
index eccd7332e..7cb5c21fd 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java
@@ -3,7 +3,6 @@ package stirling.software.proprietary.security.session;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.session.SessionRegistryImpl;
-
 import stirling.software.proprietary.security.database.repository.SessionRepository;
 
 @Configuration
diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java
index 1f491bf4d..83403f9f7 100644
--- a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java
+++ b/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java
@@ -4,13 +4,11 @@ import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.stereotype.Component;
 
-import lombok.RequiredArgsConstructor;
-
 @Component
 @RequiredArgsConstructor
 public class SessionScheduled {
diff --git a/proprietary/src/main/resources/templates/accounts/team-details.html b/proprietary/src/main/resources/templates/accounts/team-details.html
index aff0c4150..3fb779bae 100644
--- a/proprietary/src/main/resources/templates/accounts/team-details.html
+++ b/proprietary/src/main/resources/templates/accounts/team-details.html
@@ -32,6 +32,11 @@
               </div>
             </div>
 
+            <!-- Alert Messages -->
+            <div th:if="${errorMessage}" class="alert alert-danger data-mb-3">
+              <span th:text="#{${errorMessage}}">Default message if not found</span>
+            </div>
+
             <div class="data-actions data-actions-start">
               <a th:href="@{'/teams'}" class="data-btn data-btn-secondary">
                 <span class="material-symbols-rounded">arrow_back</span>
diff --git a/proprietary/src/main/resources/templates/accounts/teams.html b/proprietary/src/main/resources/templates/accounts/teams.html
index 509c3f727..a1e485d62 100644
--- a/proprietary/src/main/resources/templates/accounts/teams.html
+++ b/proprietary/src/main/resources/templates/accounts/teams.html
@@ -29,12 +29,29 @@
           <div class="data-body">
             <!-- Back Button -->
             <div class="data-actions data-actions-start">
-              <a href="/adminSettings" class="data-btn data-btn-secondary">
+              <a th:href="@{'/adminSettings'}" class="data-btn data-btn-secondary">
                 <span class="material-symbols-rounded">arrow_back</span>
                 <span th:text="#{back.toSettings}">Back to Settings</span>
               </a>
             </div>
 
+            <!-- Alert Messages -->
+            <div th:if="${addMessage}" class="alert alert-success data-mb-3">
+              <span th:text="#{${addMessage}}">Default message if not found</span>
+            </div>
+
+            <div th:if="${changeMessage}" class="alert alert-success data-mb-3">
+              <span th:text="#{${changeMessage}}">Default message if not found</span>
+            </div>
+
+            <div th:if="${deleteMessage}" class="alert alert-danger data-mb-3">
+              <span th:text="#{${deleteMessage}}">Default message if not found</span>
+            </div>
+
+            <div th:if="${errorMessage}" class="alert alert-danger data-mb-3">
+              <span th:text="#{${errorMessage}}">Default message if not found</span>
+            </div>
+
             <!-- Create New Team Button -->
             <div class="data-actions">
               <a href="#" th:data-bs-toggle="${@runningProOrHigher} ? 'modal' : null"
diff --git a/stirling-pdf/build.gradle b/stirling-pdf/build.gradle
index cc0fcc9ae..c7a85dad4 100644
--- a/stirling-pdf/build.gradle
+++ b/stirling-pdf/build.gradle
@@ -12,6 +12,13 @@ configurations {
     }
 }
 
+spotless {
+    java {
+        target sourceSets.main.allJava
+        googleJavaFormat(googleJavaFormatVersion).aosp()
+    }
+}
+
 dependencies {
     if (System.getenv('STIRLING_PDF_DESKTOP_UI') != 'false'
         || (project.hasProperty('STIRLING_PDF_DESKTOP_UI')
@@ -33,7 +40,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.19.0'
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
-    implementation 'io.micrometer:micrometer-core:1.14.6'
+    implementation 'io.micrometer:micrometer-core:1.15.1'
     implementation 'com.google.zxing:core:3.5.3'
     implementation "org.commonmark:commonmark:$commonmarkVersion" // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark-ext-gfm-tables:$commonmarkVersion"
@@ -49,10 +56,10 @@ dependencies {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
     implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
-    implementation 'com.opencsv:opencsv:5.11' // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation 'com.opencsv:opencsv:5.11.1' // https://mvnrepository.com/artifact/com.opencsv/opencsv
 
     // Batik
-    implementation 'org.apache.xmlgraphics:batik-all:1.18'
+    implementation 'org.apache.xmlgraphics:batik-all:1.19'
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -99,7 +106,7 @@ sourceSets {
             }
         }
     }
-    
+
 }
 
 
@@ -118,7 +125,7 @@ bootJar {
     // from {
     //     configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     // }
-    
+
     // Exclude signature files to prevent "Invalid signature file digest" errors
     exclude 'META-INF/*.SF'
     exclude 'META-INF/*.DSA'
@@ -134,4 +141,4 @@ bootJar {
 }
 
 bootJar.dependsOn ':common:jar'
-bootJar.dependsOn ':proprietary:jar'
\ No newline at end of file
+bootJar.dependsOn ':proprietary:jar'
diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java
index 48d1da980..9720cacf0 100644
--- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java
+++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java
@@ -19,7 +19,6 @@ package org.apache.pdfbox.examples.signature;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
 import org.bouncycastle.cms.CMSException;
diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
index aba11d9b0..51737ad5b 100644
--- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
+++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
@@ -30,7 +30,6 @@ import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Enumeration;
-
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
 import org.bouncycastle.cms.CMSException;
diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
index 6f57e205a..4b6494194 100644
--- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
+++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
@@ -28,7 +28,6 @@ import java.security.MessageDigest;
 import java.security.SecureRandom;
 import java.util.Base64;
 import java.util.Random;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java
index d01666d76..0003ddefc 100644
--- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java
+++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java
@@ -27,7 +27,6 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java b/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java
index 49be7fd42..000c87270 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java
@@ -2,7 +2,6 @@ package stirling.software.SPDF.Factories;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
-
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
 import stirling.software.common.util.misc.CustomColorReplaceStrategy;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java b/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java
index 2be2a082c..80358545b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java
@@ -1,13 +1,11 @@
 package stirling.software.SPDF;
 
+import io.github.pixee.security.SystemCommand;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
-import io.github.pixee.security.SystemCommand;
-
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java b/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java
index 27bef32e4..bdc9ced0f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF;
 
+import io.github.pixee.security.SystemCommand;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -9,20 +12,12 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
 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;
-
 import stirling.software.SPDF.UI.WebBrowser;
 import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.configuration.ConfigInitializer;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
index 959e7f354..a10f28e5e 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.UI.impl;
 
+import jakarta.annotation.PreDestroy;
 import java.awt.AWTException;
 import java.awt.BorderLayout;
 import java.awt.Frame;
@@ -14,13 +15,16 @@ import java.io.File;
 import java.io.InputStream;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
-
 import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
-
+import lombok.extern.slf4j.Slf4j;
+import me.friwi.jcefmaven.CefAppBuilder;
+import me.friwi.jcefmaven.EnumProgress;
+import me.friwi.jcefmaven.MavenCefAppHandlerAdapter;
+import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler;
 import org.cef.CefApp;
 import org.cef.CefClient;
 import org.cef.CefSettings;
@@ -32,16 +36,6 @@ import org.cef.handler.CefDownloadHandlerAdapter;
 import org.cef.handler.CefLoadHandlerAdapter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
-
-import jakarta.annotation.PreDestroy;
-
-import lombok.extern.slf4j.Slf4j;
-
-import me.friwi.jcefmaven.CefAppBuilder;
-import me.friwi.jcefmaven.EnumProgress;
-import me.friwi.jcefmaven.MavenCefAppHandlerAdapter;
-import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler;
-
 import stirling.software.SPDF.UI.WebBrowser;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.util.UIScaling;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
index 5c7381fa4..102539bed 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.UI.impl;
 
+import io.github.pixee.security.BoundedLineReader;
 import java.awt.*;
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -7,14 +8,9 @@ import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
 import javax.imageio.ImageIO;
 import javax.swing.*;
-
-import io.github.pixee.security.BoundedLineReader;
-
 import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.util.UIScaling;
 
 @Slf4j
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
index c4c528f77..f94819ff8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java
@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
-
 import stirling.software.common.configuration.interfaces.ShowAdminInterface;
 import stirling.software.common.model.ApplicationProperties;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java
index 05057b609..65a6a93da 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java
@@ -1,16 +1,14 @@
 package stirling.software.SPDF.config;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
 public class CleanUrlInterceptor implements HandlerInterceptor {
 
 	private static final List<String> ALLOWED_PARAMS = Arrays.asList(
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
index c9872992a..374e9f340 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -5,12 +5,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Service
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java
index d9ceb0f9d..afe6331df 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
-
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -17,8 +17,6 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import lombok.RequiredArgsConstructor;
-
 @Component
 @RequiredArgsConstructor
 public class EndpointInspector implements ApplicationListener<ContextRefreshedEvent> {
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
index 52fb42e07..0c50872d8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
@@ -1,13 +1,11 @@
 package stirling.software.SPDF.config;
 
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 @Component
 @Slf4j
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
index 7dd6d2b3b..4062d5676 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
@@ -1,17 +1,13 @@
 package stirling.software.SPDF.config;
 
+import jakarta.annotation.PostConstruct;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-import org.springframework.context.annotation.Configuration;
-
-import jakarta.annotation.PostConstruct;
-
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.context.annotation.Configuration;
 import stirling.software.common.configuration.RuntimePathConfig;
 
 @Configuration
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java
index d242bfeab..4770cc824 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java
@@ -1,22 +1,17 @@
 package stirling.software.SPDF.config;
 
+import io.micrometer.common.util.StringUtils;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Properties;
 import java.util.UUID;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
-
-import io.micrometer.common.util.StringUtils;
-
-import jakarta.annotation.PostConstruct;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
index 97fbb4d21..11646fa3f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java
@@ -1,7 +1,7 @@
 package stirling.software.SPDF.config;
 
 import java.util.Locale;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -9,9 +9,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java
index f5839637d..14a207bb7 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java
@@ -1,8 +1,7 @@
 package stirling.software.SPDF.config;
 
-import stirling.software.common.configuration.InstallationPathConfig;
-
 import ch.qos.logback.core.PropertyDefinerBase;
+import stirling.software.common.configuration.InstallationPathConfig;
 
 public class LogbackPropertyLoader extends PropertyDefinerBase {
     @Override
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java
index 7012ad517..ed9083dbf 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java
@@ -1,11 +1,10 @@
 package stirling.software.SPDF.config;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.config.MeterFilterReply;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class MetricsConfig {
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
index 7813222e2..0df05576d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
@@ -1,21 +1,16 @@
 package stirling.software.SPDF.config;
 
-import java.io.IOException;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
-
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
-
+import java.io.IOException;
 import lombok.RequiredArgsConstructor;
-
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
 import stirling.software.common.util.RequestUriUtils;
 
 @Component
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
index 78d2a3d2b..ce477c1ae 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -1,8 +1,5 @@
 package stirling.software.SPDF.config;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Contact;
@@ -10,9 +7,9 @@ import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-
 import lombok.RequiredArgsConstructor;
-
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java
index 737b47d5d..514328185 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.config;
 
 import java.time.LocalDateTime;
-
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
index 3e84f6465..d738749ae 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
@@ -1,12 +1,10 @@
 package stirling.software.SPDF.config;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.configuration.InstallationPathConfig;
 
 @Configuration
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
index e5d3ba884..317c1e424 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java
@@ -1,21 +1,16 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.Hidden;
-
-import jakarta.servlet.http.HttpServletResponse;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.SPDF.service.LanguageService;
 
 @RestController
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
index b6419890a..e7f23f877 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java
@@ -1,8 +1,10 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.util.*;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -12,12 +14,6 @@ import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.springframework.web.bind.annotation.*;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java
index 3a2d16757..c8117c72d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java
@@ -1,8 +1,10 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -15,12 +17,6 @@ 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 stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java
index 6a30e6bb3..098305277 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java
@@ -1,11 +1,16 @@
 package stirling.software.SPDF.controller.api;
 
+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 java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
@@ -20,16 +25,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-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.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
index 5e37314a6..edf12f28b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
@@ -1,5 +1,7 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +12,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -26,13 +29,6 @@ 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.MergePdfsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
index c57e3a6c0..a4fffdf9d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java
@@ -1,9 +1,12 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -17,13 +20,6 @@ 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.general.MergeMultiplePagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
index d6602351e..073ca1fe2 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java
@@ -1,20 +1,16 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 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 stirling.software.SPDF.service.PdfImageRemovalService;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java
index e6fc2c561..e95fbb782 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -8,7 +11,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.Overlay;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -19,13 +22,6 @@ 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.general.OverlayPdfsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
index 3bf2ec802..063ef87aa 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java
@@ -1,10 +1,14 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.ResponseEntity;
@@ -13,14 +17,6 @@ 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.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java
index afdfc54d9..aa013e0e8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
@@ -11,13 +14,6 @@ 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.general.RotatePDFRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
index b2d689728..a5913bc68 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
@@ -1,10 +1,13 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -18,13 +21,6 @@ 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.general.ScalePagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
index 0e9cd96dc..a5fdb12d8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
@@ -1,8 +1,10 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -10,12 +12,6 @@ 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.RequestMapping;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
index 1b65891ac..d6645438f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -9,7 +12,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.MediaType;
@@ -19,14 +23,6 @@ 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.model.api.PDFWithPageNums;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
index 94cf6aa6d..965b4f7cc 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -7,7 +10,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
@@ -19,18 +27,6 @@ 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.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 import stirling.software.common.model.PdfMetadata;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
index c2bbd31b5..b56090570 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -8,7 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -24,13 +27,6 @@ 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.SplitPdfBySectionsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java
index 3df62816f..b62dd4664 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java
@@ -1,12 +1,16 @@
 package stirling.software.SPDF.controller.api;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.MediaType;
@@ -16,14 +20,6 @@ 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.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
index 9085f41b1..3ec758a43 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
@@ -1,9 +1,11 @@
 package stirling.software.SPDF.controller.api;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.geom.AffineTransform;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -15,12 +17,6 @@ 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 stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
index 32aedf57c..e63be6fc4 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
@@ -1,8 +1,12 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -12,14 +16,6 @@ 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.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java
index cdd9bc1a7..660958daa 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java
@@ -1,18 +1,15 @@
 package stirling.software.SPDF.controller.api.converters;
 
+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 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.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
index 3125f8335..2adde53c3 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -10,7 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -22,14 +26,6 @@ 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.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java
index 98f96fbdb..62cfb95c0 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java
@@ -1,8 +1,11 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
 import org.commonmark.Extension;
 import org.commonmark.ext.gfm.tables.TableBlock;
 import org.commonmark.ext.gfm.tables.TablesExtension;
@@ -16,13 +19,6 @@ 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.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.api.GeneralFile;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
index d81e3843f..0aaa136cc 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -7,7 +10,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
@@ -16,13 +19,6 @@ 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.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java
index 9015dee2e..68c8703b8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java
@@ -1,15 +1,13 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 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 stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.PDFToFile;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java
index 585185460..c41387566 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.MediaType;
@@ -11,13 +14,6 @@ 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.PdfToPresentationRequest;
 import stirling.software.SPDF.model.api.converters.PdfToTextOrRTFRequest;
 import stirling.software.SPDF.model.api.converters.PdfToWordRequest;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
index 73efc03fd..9f8c19158 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
@@ -1,12 +1,15 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -15,13 +18,6 @@ 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.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
index b16cc01d9..25a63c3fd 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
@@ -1,24 +1,20 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 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.converters.UrlToPdfRequest;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java
index 847904b60..767dc503d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java
@@ -1,5 +1,7 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -9,7 +11,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.QuoteMode;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -21,17 +24,9 @@ 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.PDFWithPageNums;
 import stirling.software.SPDF.pdf.FlexibleCSVWriter;
 import stirling.software.common.service.CustomPDFDocumentFactory;
-
 import technology.tabula.ObjectExtractor;
 import technology.tabula.Page;
 import technology.tabula.Table;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java
index 96322ad80..8591ca8b3 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api.filters;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -11,13 +14,6 @@ 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.PDFComparisonAndCount;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.filter.ContainsTextRequest;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
index 8d803708c..955cb2e14 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java
@@ -1,10 +1,14 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
@@ -14,14 +18,6 @@ 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.model.api.misc.ExtractHeaderRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
index 44d575575..a1705ac97 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java
@@ -1,5 +1,10 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import com.google.zxing.*;
+import com.google.zxing.common.HybridBinarizer;
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.awt.image.DataBufferInt;
@@ -13,7 +18,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.MediaType;
@@ -23,17 +29,6 @@ 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.google.zxing.*;
-import com.google.zxing.common.HybridBinarizer;
-
-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.model.api.misc.AutoSplitPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
index a7314fc7e..ec95fbfa8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -7,7 +10,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
@@ -21,14 +25,6 @@ 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.model.api.misc.RemoveBlankPagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
index 8509f5056..d314f7e84 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -17,14 +20,17 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
 import javax.imageio.stream.ImageOutputStream;
-
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -38,17 +44,6 @@ 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.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java
index cfbc88e8b..036f6c911 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java
@@ -1,11 +1,14 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Set;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.*;
 import org.apache.pdfbox.io.IOUtils;
 import org.apache.pdfbox.pdfwriter.compress.CompressParameters;
@@ -17,13 +20,6 @@ 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.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
index d5d3a63fb..6330aca79 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java
@@ -1,5 +1,7 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.image.BufferedImage;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -10,9 +12,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.imageio.ImageIO;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
@@ -23,13 +25,6 @@ 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.misc.ExtractImageScansRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.CheckProgramInstall;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
index 4ec844485..fc6bb89e4 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
@@ -17,9 +20,9 @@ import java.util.concurrent.Future;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.imageio.ImageIO;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -31,14 +34,6 @@ 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.model.api.PDFExtractImagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ImageProcessingUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java
index 7872a4b09..4b238c9fc 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java
@@ -1,5 +1,9 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
@@ -8,7 +12,8 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Random;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -23,16 +28,6 @@ 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 jakarta.validation.Valid;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.api.misc.FakeScanRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java
index d82a1971a..fde974484 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java
@@ -1,8 +1,12 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -17,14 +21,6 @@ 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.model.api.misc.FlattenRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
index 1d5196940..f5fc88548 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java
@@ -1,12 +1,16 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.Map.Entry;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
@@ -14,14 +18,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 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.model.api.misc.MetadataRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
index be6c4649c..dc219fbdd 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java
@@ -1,5 +1,9 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.BoundedLineReader;
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.nio.file.Files;
@@ -7,9 +11,9 @@ import java.nio.file.Path;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.imageio.ImageIO;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -22,15 +26,6 @@ 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.BoundedLineReader;
-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.model.api.misc.ProcessPdfWithOcrRequest;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java
index d50c80967..666b28697 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java
@@ -1,7 +1,11 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -9,14 +13,6 @@ 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.model.api.misc.OverlayImageRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java
index 4233d11e4..96e19c653 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java
@@ -1,9 +1,12 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -17,13 +20,6 @@ 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.misc.AddPageNumbersRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
index 79140c571..a1af36d6b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.print.PageFormat;
@@ -8,11 +9,10 @@ import java.awt.print.PrinterException;
 import java.awt.print.PrinterJob;
 import java.io.IOException;
 import java.util.Arrays;
-
 import javax.imageio.ImageIO;
 import javax.print.PrintService;
 import javax.print.PrintServiceLookup;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.printing.PDFPageable;
@@ -22,11 +22,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 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.tags.Tag;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.api.misc.PrintFileRequest;
 
 @RestController
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java
index 85340a163..c11cc8f09 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java
@@ -1,24 +1,20 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 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.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ProcessExecutor;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java
index 85fb7cfc3..bad7c9b43 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java
@@ -1,7 +1,9 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -10,12 +12,6 @@ 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 stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest;
 import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java
index 94e9b57c6..2d8da92cc 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java
@@ -1,8 +1,11 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
@@ -13,13 +16,6 @@ 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.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
index 9c0ad2909..d6dee9192 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -8,9 +11,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.List;
-
 import javax.imageio.ImageIO;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -31,13 +33,6 @@ 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.misc.AddStampRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java
index e7dfba041..d845c8548 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java
@@ -1,10 +1,13 @@
 package stirling.software.SPDF.controller.api.misc;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.*;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.PDStream;
@@ -16,13 +19,6 @@ 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.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
index d573301d0..7eab3ce92 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
@@ -1,5 +1,9 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -7,7 +11,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -16,16 +21,6 @@ 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.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
index a3548ed49..c9bce8207 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -22,16 +23,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Stream;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
index 222ecd1c6..c70964bf7 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
+import io.github.pixee.security.Filenames;
+import io.github.pixee.security.ZipSecurity;
+import jakarta.servlet.ServletContext;
 import java.io.*;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -13,7 +16,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
@@ -23,14 +26,6 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
-
-import io.github.pixee.security.Filenames;
-import io.github.pixee.security.ZipSecurity;
-
-import jakarta.servlet.ServletContext;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
index 3260eb31f..7e351f86b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.beans.PropertyEditorSupport;
 import java.io.*;
@@ -11,7 +14,8 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Calendar;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.examples.signature.CreateSignatureBase;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -63,14 +67,6 @@ 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.model.api.security.SignPDFWithCertRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
index c630106e4..a10574d09 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
@@ -1,11 +1,17 @@
 package stirling.software.SPDF.controller.api.security;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.cos.COSInputStream;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSString;
@@ -50,17 +56,6 @@ 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;
-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.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
index 4567fcb7e..ae38c2a49 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
@@ -11,13 +14,6 @@ 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.security.AddPasswordRequest;
 import stirling.software.SPDF.model.api.security.PDFPasswordRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
index 88d271cfb..c7dea99fd 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -8,7 +11,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
@@ -22,14 +26,6 @@ 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.model.PDFText;
 import stirling.software.SPDF.model.api.security.ManualRedactPdfRequest;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java
index 79fd18914..264e4b81b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
@@ -13,13 +16,6 @@ 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.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
index 47e45c595..d45a896a6 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
@@ -1,7 +1,10 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -27,13 +30,6 @@ 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.security.SanitizePdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java
index b3f01ef47..24d9923ae 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java
@@ -1,5 +1,7 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.beans.PropertyEditorSupport;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -10,7 +12,7 @@ import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -31,12 +33,6 @@ 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.security.SignatureValidationRequest;
 import stirling.software.SPDF.model.api.security.SignatureValidationResult;
 import stirling.software.SPDF.service.CertificateValidationService;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
index fd8f1cf8a..71e18e824 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
@@ -1,5 +1,8 @@
 package stirling.software.SPDF.controller.api.security;
 
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.beans.PropertyEditorSupport;
@@ -8,9 +11,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
-
 import javax.imageio.ImageIO;
-
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -32,13 +34,6 @@ 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.security.AddWatermarkRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java
index 34f8a8daa..0c16c2ace 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java
@@ -1,13 +1,11 @@
 package stirling.software.SPDF.controller.web;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
 import stirling.software.common.util.CheckProgramInstall;
 
 @Controller
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
index 72486a28f..9985455d2 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
@@ -1,5 +1,9 @@
 package stirling.software.SPDF.controller.web;
 
+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 java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -8,22 +12,13 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Stream;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-
-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.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.SignatureFile;
 import stirling.software.SPDF.service.SignatureService;
 import stirling.software.common.configuration.InstallationPathConfig;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
index 2b36f95af..aec8e986d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
@@ -1,11 +1,15 @@
 package stirling.software.SPDF.controller.web;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.Hidden;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
@@ -13,15 +17,6 @@ import org.springframework.stereotype.Controller;
 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;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
index e82acaffa..8a313ea99 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
@@ -1,27 +1,22 @@
 package stirling.software.SPDF.controller.web;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.*;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-
 import jakarta.annotation.PostConstruct;
-
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import stirling.software.SPDF.config.EndpointInspector;
 import stirling.software.SPDF.config.StartupApplicationListener;
 import stirling.software.common.model.ApplicationProperties;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
index 25333d495..4da017766 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
@@ -1,20 +1,16 @@
 package stirling.software.SPDF.controller.web;
 
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.CheckProgramInstall;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
index eb7245e5a..3e153841f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
@@ -1,11 +1,10 @@
 package stirling.software.SPDF.controller.web;
 
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 
 @Controller
 @Tag(name = "Security", description = "Security APIs")
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java
index de03680e1..63e3ca7fb 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.controller.web;
 
 import java.io.IOException;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -10,7 +9,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import stirling.software.SPDF.service.SignatureService;
 import stirling.software.common.service.UserServiceInterface;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java
index 2c4ed9bec..4e9405d4c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java
@@ -2,12 +2,9 @@ package stirling.software.SPDF.controller.web;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Service
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java
index dfb06f0d8..44e8c40fd 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java
@@ -1,10 +1,9 @@
 package stirling.software.SPDF.model;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 public class ApiEndpoint {
     private final String name;
     private Map<String, JsonNode> parameters;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java
index b0d3a3e7d..7dac4ef1b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java
@@ -1,9 +1,7 @@
 package stirling.software.SPDF.model;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
-
+import java.util.List;
 import lombok.Data;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java
index 30a5ad52b..322b1ec3d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.model;
 
 import java.util.Map;
-
 import lombok.Data;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java
index 8ecf0d97e..46a74b07f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model;
 
 import java.util.List;
-
-import org.springframework.core.io.Resource;
-
 import lombok.Data;
+import org.springframework.core.io.Resource;
 
 @Data
 public class PipelineResult {
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java
index 51e3bc159..24b3cf918 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java
index 7f425dc04..60531e30b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java
@@ -1,11 +1,9 @@
 package stirling.software.SPDF.model.api;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java
index bd51ac8db..700052d9c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java
@@ -1,11 +1,9 @@
 package stirling.software.SPDF.model.api;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java
index b56a52c7a..9545c183d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java
@@ -1,11 +1,9 @@
 package stirling.software.SPDF.model.api;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java
index 9524cd274..55fcc1166 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java
index 32037ea9f..a9a1515c8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java
index 272c5c8b1..f78c36bb4 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java
index c2e8d2658..49e70a4ae 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java
index 062c890fc..1b79e88de 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java
@@ -1,16 +1,12 @@
 package stirling.software.SPDF.model.api;
 
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.GeneralUtils;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java
index 83501fb35..e682b5455 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java
index 364faeca4..c736cdf7f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java
index 3a89ab686..877e62458 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java
index fbbd4723a..096775590 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java
@@ -1,15 +1,13 @@
 package stirling.software.SPDF.model.api.converters;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 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 stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.PDFToFile;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java
index 149676946..b7d040506 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java
index c3b059fe0..39f70d56c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java
@@ -1,11 +1,9 @@
 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;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java
index 474981e76..a8b87f533 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java
index 0553988ca..821b396d8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java
index 8a5b3d376..57eae7398 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java
index bad03d97a..8b8ced398 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java
index e28bb9be8..2e005d1ba 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java
index 954045f01..cef870b3e 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.model.api.converters;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java
index 0435e5835..aecdfd992 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.filter;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java
index a3c57077d..c1f40bbe9 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.filter;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFComparison;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java
index 05fd10c31..41cea6842 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.filter;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFComparison;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java
index 2fa74f040..355ca1e10 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.filter;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFComparison;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java
index 913f94a10..3f54621db 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
index 6d9254023..c52d8a4cd 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java
index 75f75223e..1ddaadc3f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.MultiplePDFFiles;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java
index f89ba320f..f4d6e8b7b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.general;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java
index 050dc1eba..bbc3c1e9c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java
index aebc2b399..389ae2fb8 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java
index 653697f4e..319a5dc57 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFWithPageSize;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java
index 0dd599781..900b9206b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.general;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java
index 5f0f71695..2b1df026b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java
@@ -2,10 +2,8 @@ package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema.RequiredMode;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java
index 48d470a5a..2f872ef92 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.misc;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java
index 0ba3ad8bd..9be5fb14c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java
index cbb51a390..8d9591e7d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java
index 6345d4489..62063c4ca 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java
@@ -1,11 +1,9 @@
 package stirling.software.SPDF.model.api.misc;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java
index 1237d2305..b8a0df1d5 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java
@@ -1,13 +1,10 @@
 package stirling.software.SPDF.model.api.misc;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import jakarta.validation.constraints.NotNull;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 @EqualsAndHashCode
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java
index cf4e7c575..a64e9f9d9 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java
index 63b267196..ef3f1d17c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.misc;
 
-import java.util.Map;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
+import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
index eafeeceaa..9977c3ea3 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java
index 759daa991..f86cff258 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.misc;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java
index 3119c32d7..f98649162 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java
index 00279eb96..bd4d9bdba 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.misc;
 
-import java.util.List;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java
index cef00dcc0..e031a67a0 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java
index 50ef14b1e..37cfe0316 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.misc;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java
index 666318a49..5d71bad42 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.security;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java
index 00408c55e..a9049f205 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.security;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java
index 48cb5bc67..830dd707c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.security;
 
-import java.util.List;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.common.model.api.security.RedactionArea;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java
index cea62b079..d5df9b95e 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.security;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java
index 279a41a27..f8bc0f7c9 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.security;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java
index 736fbb20d..c3d94155d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java
@@ -1,10 +1,8 @@
 package stirling.software.SPDF.model.api.security;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java
index acb4b55fd..fd244ea6f 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.security;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java
index dd301e0e1..ac3b6154a 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java
@@ -1,12 +1,9 @@
 package stirling.software.SPDF.model.api.security;
 
-import org.springframework.web.multipart.MultipartFile;
-
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
+import org.springframework.web.multipart.MultipartFile;
 import stirling.software.common.model.api.PDFFile;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java
index b4c51f365..3a4e2942c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.model.api.security;
 
 import java.util.List;
-
 import lombok.Data;
 
 @Data
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java
index 94a48d935..42e13dcd6 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.pdf;
 
 import org.apache.commons.csv.CSVFormat;
-
 import technology.tabula.writers.CSVWriter;
 
 public class FlexibleCSVWriter extends CSVWriter {
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java
index 4119b3eac..bd341435e 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java
@@ -5,13 +5,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import lombok.extern.slf4j.Slf4j;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.PDFText;
 
 @Slf4j
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java
index d5cc76af8..d2c67256b 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java
@@ -1,12 +1,15 @@
 package stirling.software.SPDF.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletContext;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -14,14 +17,6 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import jakarta.servlet.ServletContext;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.common.model.enumeration.Role;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java
index f8b94f8df..f0190b48c 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java
@@ -1,17 +1,14 @@
 package stirling.software.SPDF.service;
 
+import io.github.pixee.security.BoundedLineReader;
+import jakarta.annotation.PostConstruct;
 import java.io.*;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.cert.*;
 import java.util.*;
-
 import org.springframework.stereotype.Service;
 
-import io.github.pixee.security.BoundedLineReader;
-
-import jakarta.annotation.PostConstruct;
-
 @Service
 public class CertificateValidationService {
     private KeyStore trustStore;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java
index 4731716a9..5049c676d 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java
@@ -5,13 +5,10 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.stereotype.Service;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.common.model.ApplicationProperties;
 
 @Service
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java
index acd0669c0..371fa3448 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java
@@ -1,19 +1,15 @@
 package stirling.software.SPDF.service;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.search.Search;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.search.Search;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.SPDF.config.EndpointInspector;
 import stirling.software.common.service.PostHogService;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java
index 029d0924c..0f7f7526e 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java
@@ -3,7 +3,6 @@ package stirling.software.SPDF.service;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java
index 1d25f409f..15ed2a777 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java
@@ -7,12 +7,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.thymeleaf.util.StringUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.SignatureFile;
 import stirling.software.common.configuration.InstallationPathConfig;
 
diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java
index dc61a1e1d..72696f180 100644
--- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java
+++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java
@@ -1,13 +1,10 @@
 package stirling.software.SPDF.service.misc;
 
 import java.io.IOException;
-
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-
-import lombok.RequiredArgsConstructor;
-
 import stirling.software.SPDF.Factories.ReplaceAndInvertColorFactory;
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
diff --git a/stirling-pdf/src/main/resources/messages_ar_AR.properties b/stirling-pdf/src/main/resources/messages_ar_AR.properties
index 20d1ae736..6400b39f7 100644
--- a/stirling-pdf/src/main/resources/messages_ar_AR.properties
+++ b/stirling-pdf/src/main/resources/messages_ar_AR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=لا يمكن تعطيل المستخدم الحال
 downgradeCurrentUserLongMessage=لا يمكن تخفيض دور المستخدم الحالي. وبالتالي، لن يظهر المستخدم الحالي.
 userAlreadyExistsOAuthMessage=المستخدم موجود بالفعل كمستخدم OAuth2.
 userAlreadyExistsWebMessage=المستخدم موجود بالفعل كمستخدم ويب.
+invalidRoleMessage=Invalid role.
 error=خطأ
 oops=عذرًا!
 help=مساعدة
diff --git a/stirling-pdf/src/main/resources/messages_az_AZ.properties b/stirling-pdf/src/main/resources/messages_az_AZ.properties
index 664e47065..d0a331196 100644
--- a/stirling-pdf/src/main/resources/messages_az_AZ.properties
+++ b/stirling-pdf/src/main/resources/messages_az_AZ.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Cari istifadəçi deaktivləşdirilə bilməz
 downgradeCurrentUserLongMessage=Cari istifadəçinin rolunu aşağı salmaq mümkün deyil. Deməli, cari istifadəçi göstərilməyəcək.
 userAlreadyExistsOAuthMessage=İstifadəçi OAuth2 istifadəçisi olaraq mövcuddur.
 userAlreadyExistsWebMessage=İstifadəçi veb istifadəçisi olaraq mövcuddur.
+invalidRoleMessage=Invalid role.
 error=Xəta
 oops=Oops!
 help=Yardım
diff --git a/stirling-pdf/src/main/resources/messages_bg_BG.properties b/stirling-pdf/src/main/resources/messages_bg_BG.properties
index a46fc22e0..73e8d6c33 100644
--- a/stirling-pdf/src/main/resources/messages_bg_BG.properties
+++ b/stirling-pdf/src/main/resources/messages_bg_BG.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Текущият потребител не може 
 downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан.
 userAlreadyExistsOAuthMessage=Потребителят вече съществува като OAuth2 потребител.
 userAlreadyExistsWebMessage=Потребителят вече съществува като уеб-потребител.
+invalidRoleMessage=Invalid role.
 error=Грешка
 oops=Опаа!
 help=Помощ
diff --git a/stirling-pdf/src/main/resources/messages_bo_CN.properties b/stirling-pdf/src/main/resources/messages_bo_CN.properties
index c337551dd..c2a38730f 100644
--- a/stirling-pdf/src/main/resources/messages_bo_CN.properties
+++ b/stirling-pdf/src/main/resources/messages_bo_CN.properties
@@ -135,90 +135,91 @@ lang.vie=Vietnamese
 lang.yid=Yiddish
 lang.yor=Yoruba
 
-addPageNumbers.fontSize=Font Size
-addPageNumbers.fontName=Font Name
-pdfPrompt=Select PDF(s)
-multiPdfPrompt=Select PDFs (2+)
-multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
-imgPrompt=Select Image(s)
-genericSubmit=Submit
+addPageNumbers.fontSize=ཡིག་གཟུགས་ཆེ་ཆུང་
+addPageNumbers.fontName=ཡིག་གཟུགས་མིང་
+pdfPrompt=PDF འདེམས་རོགས།
+multiPdfPrompt=PDF གཉིས་ཡན་འདེམས་རོགས།
+multiPdfDropPrompt=དགོས་མཁོ་འདི་ PDF ཡིག་ཆ་ཚང་མ་འདེམས་པའམ་འཐེན་རོགས།
+imgPrompt=པར་རིས་འདེམས་རོགས།
+genericSubmit=ཕུལ་བཅོས།
 uploadLimit=Maximum file size:
 uploadLimitExceededSingular=is too large. Maximum allowed size is
 uploadLimitExceededPlural=are too large. Maximum allowed size is
-processTimeWarning=Warning: This process can take up to a minute depending on file-size
-pageOrderPrompt=Custom Page Order (Enter a comma-separated list of page numbers or Functions like 2n+1) :
-pageSelectionPrompt=Custom Page Selection (Enter a comma-separated list of page numbers 1,5,6 or Functions like 2n+1) :
-goToPage=Go
-true=True
-false=False
-unknown=Unknown
-save=Save
-saveToBrowser=Save to Browser
-close=Close
-filesSelected=files selected
-noFavourites=No favourites added
-downloadComplete=Download Complete
-bored=Bored Waiting?
-alphabet=Alphabet
-downloadPdf=Download PDF
-text=Text
-font=Font
-selectFillter=-- Select --
-pageNum=Page Number
-sizes.small=Small
-sizes.medium=Medium
-sizes.large=Large
-sizes.x-large=X-Large
-error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
-delete=Delete
-username=Username
-password=Password
-welcome=Welcome
-property=Property
-black=Black
-white=White
-red=Red
-green=Green
-blue=Blue
-custom=Custom...
-WorkInProgess=Work in progress, May not work or be buggy, Please report any problems!
-poweredBy=Powered by
-yes=Yes
-no=No
-changedCredsMessage=Credentials changed!
-notAuthenticatedMessage=User not authenticated.
-userNotFoundMessage=User not found.
-incorrectPasswordMessage=Current password is incorrect.
-usernameExistsMessage=New Username already exists.
-invalidUsernameMessage=Invalid username, username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-invalidPasswordMessage=The password must not be empty and must not have spaces at the beginning or end.
-confirmPasswordErrorMessage=New Password and Confirm New Password must match.
-deleteCurrentUserMessage=Cannot delete currently logged in user.
-deleteUsernameExistsMessage=The username does not exist and cannot be deleted.
-downgradeCurrentUserMessage=Cannot downgrade current user's role
-disabledCurrentUserMessage=The current user cannot be disabled
-downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
-userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
-userAlreadyExistsWebMessage=The user already exists as an web user.
-error=Error
-oops=Oops!
-help=Help
-goHomepage=Go to Homepage
-joinDiscord=Join our Discord server
-seeDockerHub=See Docker Hub
-visitGithub=Visit Github Repository
-donate=Donate
-color=Colour
-sponsor=Sponsor
-info=Info
-pro=Pro
+processTimeWarning=ཉེན་བཅོས། བྱ་རིམ་འདི་ཡིག་ཆའི་ཆེ་ཆུང་ལ་གཞིགས་ནས་སྐར་མ་གཅིག་བར་འགོར་སྲིད།
+pageOrderPrompt=ཤོག་ངོས་གོ་རིམ་རང་སྒྲིག（ཤོག་གྲངས་ཀྱི་ཐོ་གཞུང་ངམ་རྩིས་རྒྱག་བྱེད་ཐབས་ 2n+1 ལྟ་བུ་འཇུག་རོགས།）
+pageSelectionPrompt=ཤོག་ངོས་འདེམས་སྒྲུག（ཤོག་གྲངས་ཀྱི་ཐོ་གཞུང་ 1,5,6 འམ་རྩིས་རྒྱག་བྱེད་ཐབས་ 2n+1 ལྟ་བུ་འཇུག་རོགས།）
+goToPage=འགྲོ་བ།
+true=བདེན་པ།
+false=རྫུན་མ།
+unknown=མི་ཤེས་པ།
+save=ཉར་ཚགས།
+saveToBrowser=བཤར་ཆེ་ནང་ཉར་ཚགས།
+close=སྒོ་རིག།
+filesSelected=ཡིག་ཆབདམས་ཟིན།
+noFavourites=དགའ་མོས་གང་ཡང་སྣོན་མེད།
+downloadComplete=ཕབ་ལེན་ལེགས་གྲུབ།
+bored=སྒུག་སྡོད་སྐྱིད་པོ་མི་འདུག་གམ།
+alphabet=གསལ་བྱེད།
+downloadPdf=PDF ཕབ་ལེན།
+text=ཡི་གེ
+font=ཡིག་གཟུགས་ཌྷ
+selectFillter=-- འདེམས་རོགས། --
+pageNum=ཤོག་གིངས།
+sizes.small=ཆུང་ཆང་།
+sizes.medium=འབྲིང་ཚད།
+sizes.large=ཆེན་པོ།
+sizes.x-large=ཧ་ཅང་ཆེན་པོ།
+error.pdfPassword=PDF ཡིག་ཆར་གསང་ཚིག་བཀོད་ཡོད་པ་དང་། གསང་ཚིག་མ་བཀོད་པའམ་ནོར་འདུག
+delete=སུབ་པ།
+username=སྤྱོད་མཁན་མིང་།
+password=གསང་ཚིག།
+welcome=དགའ་བསི་ཞུ།
+property=ཁྱད་ཆོས།
+black=ནག་པོ
+white=དཀར་པོ
+red=དམར་པོ
+green=ལྗང་ཁུ།
+blue=སྔོན་པོ
+custom=མཚན་ཉིད་རང་སྒྲིག...
+WorkInProgess=ལས་ཀ་བྱེད་བཞིན་པ། ནོར་འཁྲུལ་ཡོང་སྲིད། དཀའ་ངལ་ཡོད་ཚེ་སྙན་སེང་གནང་རོགས།
+poweredBy=མཁོ་སྲོད་བྱེད་མཁན།
+yes=ཡིན།
+no=མིན།
+changedCredsMessage=ངོ་སྤྲོད་ལག་ཁྱེར་བསྒྱུར་ཟིན།
+notAuthenticatedMessage=སྤྱོད་མཁན་ར་སྤྲོད་བྱས་མེད།
+userNotFoundMessage=སྤྱོད་མཁན་རྙེད་མ་བྱུང་།
+incorrectPasswordMessage=ད་ལྟའི་གསང་ཚིག་ནོར་འདུག
+usernameExistsMessage=སྤྱོད་མཁན་མིང་གསར་པ་དེ་ཡོད་ཟིན།
+invalidUsernameMessage=སྤྱོད་མཁན་མིང་ནུས་མེད། ཡི་གེ་དང་ཨང་ཀི། དམིགས་བསལ་མཚོན་རྟགས་ @._+- ཡང་ན་གློག་འཕྲིན་ཁ་བྱང་ཚད་ལྡན་ཞིག་དགོས།
+invalidPasswordMessage=གསང་ཚིག་སྟོང་པ་ཡིན་མི་ཆོག་ལ། མགོ་མཇུག་ཏུ་བར་སྟོང་ཡོད་མི་ཆོག
+confirmPasswordErrorMessage=གསང་ཚིག་གསར་པ་དང་གསང་ཚིག་གསར་པ་ངོས་སྦྱོར་གཉིས་མཐུན་དགོས།
+deleteCurrentUserMessage=ད་ལྟ་ནང་འཛུལ་བྱས་པའི་སྤྱོད་མཁན་སུབ་མི་ཆོག
+deleteUsernameExistsMessage=སྤྱོད་མཁན་མིང་མེད་པས་སུབ་མི་ཐུབ།
+downgradeCurrentUserMessage=ད་ལྟའི་སྤྱོད་མཁན་གྱི་གོ་གནས་མར་འབེབས་མི་ཆོག
+disabledCurrentUserMessage=ད་ལྟའི་སྤྱོད་མཁན་སྤྱོད་མི་ཆོག་པ་བཟོ་མི་ཆོག
+downgradeCurrentUserLongMessage=ད་ལྟའི་སྤྱོད་མཁན་གྱི་གོ་གནས་མར་འབེབས་མི་ཆོག དེར་བརྟེན་ད་ལྟའི་སྤྱོད་མཁན་སྟོན་མི་སྲིད།
+userAlreadyExistsOAuthMessage=སྤྱོད་མཁན་འདི་ OAuth2 སྤྱོད་མཁན་ཞིག་ཏུ་ཡོད་ཟིན།
+userAlreadyExistsWebMessage=སྤྱོད་མཁན་འདི་དྲ་ཚིགས་སྤྱོད་མཁན་ཞིག་ཏུ་ཡོད་ཟིན།
+invalidRoleMessage=Invalid role.
+error=ནོར་འཁྲུལ།
+oops=ཨ་ཙི།
+help=རོགས་རམ།
+goHomepage=གཙོ་ངོས་སུ་ཕྱིན།
+joinDiscord=ང་ཚོའི་ Discord སྡེ་ཚན་དུ་འཛུལ།
+seeDockerHub=Docker Hub ལ་ལྟ་བ།
+visitGithub=Github མཛོད་ཁང་ལ་འཚམས་འདྲི།
+donate=ཞལ་འདེབས།
+color=ཚོན་མདོག
+sponsor=མཐུན་འགྱུར་སྦྱོར་མཁན།
+info=ཆ་འཕྲིན།
+pro=ཆེད་ལས།
 proFeatures=Pro Features
-page=Page
-pages=Pages
-loading=Loading...
-addToDoc=Add to Document
-reset=Reset
-apply=Apply
+page=ཤོག་ངོས།
+pages=ཤོག་ངོས་ཁག
+loading=འཇུག་བཞིན་པ...
+addToDoc=ཡིག་ཆར་སྣོན།
+reset=བསྐྱར་སྒྲིག
+apply=ཉེར་སྤྱོད།
 noFileSelected=No file selected. Please upload one.
 view=View
 cancel=Cancel
@@ -227,157 +228,157 @@ back.toSettings=Back to Settings
 back.toHome=Back to Home
 back.toAdmin=Back to Admin
 
-legal.privacy=Privacy Policy
-legal.terms=Terms and Conditions
-legal.accessibility=Accessibility
-legal.cookie=Cookie Policy
-legal.impressum=Impressum
+legal.privacy=གསང་དོན་སྲིད་བྱུས།
+legal.terms=བེད་སྤྱོད་ཆ་རྐྱེན།
+legal.accessibility=བེད་སྤྱོད་ནུས་པ།
+legal.cookie=Cookie སྲིད་བྱུས།
+legal.impressum=པར་འདེབས་བདག་དབང་།
 legal.showCookieBanner=Cookie Preferences
 
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Pipeline Menu (Beta)
-pipeline.uploadButton=Upload Custom
-pipeline.configureButton=Configure
-pipeline.defaultOption=Custom
-pipeline.submitButton=Submit
-pipeline.help=Pipeline Help
-pipeline.scanHelp=Folder Scanning Help
-pipeline.deletePrompt=Are you sure you want to delete pipeline
+pipeline.header=བརྒྱུད་རིམ་ཐོ་ཡིག (Beta)
+pipeline.uploadButton=མཁོ་སྤྲོད་རང་སྒྲིག
+pipeline.configureButton=སྒྲིག་འགོད།
+pipeline.defaultOption=རང་སྒྲིག
+pipeline.submitButton=ཕུལ་བ།
+pipeline.help=བརྒྱུད་རིམ་རོགས་རམ།
+pipeline.scanHelp=ཡིག་སྣོད་བཤེར་འཚོལ་རོགས་རམ།
+pipeline.deletePrompt=བརྒྱུད་རིམ་སུབ་རྒྱུ་གཏན་འཁེལ་ལམ།
 
 ######################
 #  Pipeline Options  #
 ######################
-pipelineOptions.header=Pipeline Configuration
-pipelineOptions.pipelineNameLabel=Pipeline Name
-pipelineOptions.saveSettings=Save Operation Settings
-pipelineOptions.pipelineNamePrompt=Enter pipeline name here
-pipelineOptions.selectOperation=Select Operation
-pipelineOptions.addOperationButton=Add operation
-pipelineOptions.pipelineHeader=Pipeline:
-pipelineOptions.saveButton=Download
-pipelineOptions.validateButton=Validate
+pipelineOptions.header=བརྒྱུད་རིམ་སྒྲིག་འགོད།
+pipelineOptions.pipelineNameLabel=བརྒྱུད་རིམ་མིང་།
+pipelineOptions.saveSettings=བཀོལ་སྤྱོད་སྒྲིག་འགོད་ཉར་ཚགས།
+pipelineOptions.pipelineNamePrompt=བརྒྱུད་རིམ་གྱི་མིང་འདིར་འཇུག་རོགས།
+pipelineOptions.selectOperation=བཀོལ་སྤྱོད་འདེམས་རོགས།
+pipelineOptions.addOperationButton=བཀོལ་སྤྱོད་སྣོན།
+pipelineOptions.pipelineHeader=བརྒྱུད་རིམ།
+pipelineOptions.saveButton=ཕབ་ལེན།
+pipelineOptions.validateButton=ཚད་ལྡན་ཡིན་མིན་ཞིབ་བཤེར།
 
 ########################
 #  ENTERPRISE EDITION  #
 ########################
-enterpriseEdition.button=Upgrade to Pro
-enterpriseEdition.warning=This feature is only available to Pro users.
-enterpriseEdition.yamlAdvert=Stirling PDF Pro supports YAML configuration files and other SSO features.
-enterpriseEdition.ssoAdvert=Looking for more user management features? Check out Stirling PDF Pro
+enterpriseEdition.button=ཆེད་ལས་པའི་རིམ་པར་རྒྱག
+enterpriseEdition.warning=ནུས་པ་འདི་ཆེད་ལས་པའི་སྤྱོད་མཁན་ཁོ་ནར་སྤྱོད་ཆོག
+enterpriseEdition.yamlAdvert=Stirling PDF Pro ཡིས་ YAML སྒྲིག་འགོད་ཡིག་ཆ་དང་ SSO ནུས་པ་གཞན་དག་ལ་རྒྱབ་སྐྱོར་བྱེད།
+enterpriseEdition.ssoAdvert=སྤྱོད་མཁན་དོ་དམ་ནུས་པ་མང་བ་དགོས་སམ། Stirling PDF Pro ལ་ལྟ་རོགས།
 enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro licence or higher
 
 
 #################
 #  Analytics    #
 #################
-analytics.title=Do you want make Stirling PDF better?
-analytics.paragraph1=Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents.
-analytics.paragraph2=Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.
-analytics.enable=Enable analytics
-analytics.disable=Disable analytics
-analytics.settings=You can change the settings for analytics in the config/settings.yml file
+analytics.title=ཁྱེད་ཀྱིས་ Stirling PDF ལེགས་སུ་གཏོང་འདོད་དམ།
+analytics.paragraph1=Stirling PDF ལ་ཐོན་རྫས་ལེགས་སུ་གཏོང་བར་རོགས་རམ་བྱེད་པའི་གདམ་ག་ཡོད་པའི་དཔྱད་ཞིབ་ཡོད། ང་ཚོས་སྒེར་གྱི་ཆ་འཕྲིན་དང་ཡིག་ཆའི་ནང་དོན་གང་ཡང་རྗེས་འདེད་མི་བྱེད།
+analytics.paragraph2=Stirling-PDF འཕེལ་རྒྱས་དང་ང་ཚོའི་སྤྱོད་མཁན་ལེགས་པོར་རྟོགས་པར་རོགས་རམ་བྱེད་པའི་ཆེད་དུ་དཔྱད་ཞིབ་སྤྱོད་འགོ་འཛུགས་རོགས།
+analytics.enable=དཔྱད་ཞིབ་སྤྱོད་འགོ་འཛུགས།
+analytics.disable=དཔྱད་ཞིབ་སྤྱོད་མཚམས་འཇོག
+analytics.settings=དཔྱད་ཞིབ་ཀྱི་སྒྲིག་འགོད་ config/settings.yml ཡིག་ཆའི་ནང་བསྒྱུར་བཅོས་བྱེད་ཆོག
 
 
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=Favorites
+navbar.favorite=དགའ་མོས།
 navbar.recent=New and recently updated
-navbar.darkmode=Dark Mode
-navbar.language=Languages
-navbar.settings=Settings
-navbar.allTools=Tools
-navbar.multiTool=Multi Tool
-navbar.search=Search
-navbar.sections.organize=Organize
-navbar.sections.convertTo=Convert to PDF
-navbar.sections.convertFrom=Convert from PDF
-navbar.sections.security=Sign & Security
-navbar.sections.advance=Advanced
-navbar.sections.edit=View & Edit
-navbar.sections.popular=Popular
+navbar.darkmode=མུན་ནག་རྣམ་པ།
+navbar.language=སྐད་རིགས།
+navbar.settings=སྒྲིག་འགོད།
+navbar.allTools=ལག་ཆ།
+navbar.multiTool=ལག་ཆ་མང་པོ།
+navbar.search=འཚོལ་བཤེར།
+navbar.sections.organize=གོ་སྒྲིག
+navbar.sections.convertTo=PDF ལ་བསྒྱུར་བ།
+navbar.sections.convertFrom=PDF ནས་བསྒྱུར་བ།
+navbar.sections.security=མིང་རྟགས་དང་བདེ་འཇགས།
+navbar.sections.advance=མཐོ་རིམ།
+navbar.sections.edit=ལྟ་བ་དང་རྩོམ་སྒྲིག
+navbar.sections.popular=སྤྱི་མོས།
 
 #############
 #  SETTINGS #
 #############
-settings.title=Settings
-settings.update=Update available
-settings.updateAvailable={0} is the current installed version. A new version ({1}) is available.
-settings.appVersion=App Version:
-settings.downloadOption.title=Choose download option (For single file non zip downloads):
-settings.downloadOption.1=Open in same window
-settings.downloadOption.2=Open in new window
-settings.downloadOption.3=Download file
-settings.zipThreshold=Zip files when the number of downloaded files exceeds
-settings.signOut=Sign Out
-settings.accountSettings=Account Settings
-settings.bored.help=Enables easter egg game
-settings.cacheInputs.name=Save form inputs
-settings.cacheInputs.help=Enable to store previously used inputs for future runs
+settings.title=སྒྲིག་འགོད།
+settings.update=གསར་སྒྱུར་ཡོད།
+settings.updateAvailable={0} ནི་ད་ལྟ་སྒྲིག་འཇུག་བྱས་པའི་པར་གཞི་ཡིན། པར་གཞི་གསར་པ་ ({1}) ཡོད།
+settings.appVersion=མཉེན་ཆས་པར་གཞི།
+settings.downloadOption.title=ཕབ་ལེན་གདམ་ག་འདེམས་རོགས། (ཡིག་ཆ་རྐྱང་པ་ zip མིན་པའི་ཕབ་ལེན་ཆེད།)：
+settings.downloadOption.1=སྒེའུ་ཁུང་གཅིག་པའི་ནང་ཁ་ཕྱེ།
+settings.downloadOption.2=སྒེའུ་ཁུང་གསར་པར་ཁ་ཕྱེ།
+settings.downloadOption.3=ཡིག་ཆ་ཕབ་ལེན།
+settings.zipThreshold=ཕབ་ལེན་བྱས་པའི་ཡིག་ཆའི་གྲངས་ཀ་འདི་ལས་བརྒལ་ན་ zip བྱེད།
+settings.signOut=ཕྱིར་འབུད།
+settings.accountSettings=ཐོ་མིང་སྒྲིག་འགོད།
+settings.bored.help=སྒོ་ང་རྩེད་མོ་སྤྱོད་འགོ་རྩོམ།
+settings.cacheInputs.name=ནང་འཇུག་གི་ནང་དོན་ཉར་ཚགས།
+settings.cacheInputs.help=སྔོན་མ་བེད་སྤྱད་པའི་ནང་འཇུག་གི་ནང་དོན་མ་འོངས་པར་བེད་སྤྱོད་ཆེད་ཉར་ཚགས་བྱེད།
 
-changeCreds.title=Change Credentials
-changeCreds.header=Update Your Account Details
-changeCreds.changePassword=You are using default login credentials. Please enter a new password
-changeCreds.newUsername=New Username
-changeCreds.oldPassword=Current Password
-changeCreds.newPassword=New Password
-changeCreds.confirmNewPassword=Confirm New Password
-changeCreds.submit=Submit Changes
+changeCreds.title=ངོ་སྤྲོད་ལག་ཁྱེར་བསྒྱུར་བ།
+changeCreds.header=ཁྱེད་ཀྱི་ཐོ་མིང་ཞིབ་ཕྲ་གསར་སྒྱུར།
+changeCreds.changePassword=ཁྱེད་ཀྱིས་སྔོན་སྒྲིག་ནང་འཛུལ་ངོ་སྤྲོད་བེད་སྤྱོད་བྱེད་བཞིན་ཡོད། གསང་ཚིག་གསར་པ་འཇུག་རོགས།
+changeCreds.newUsername=སྤྱོད་མཁན་མིང་གསར་པ།
+changeCreds.oldPassword=ད་ལྟའི་གསང་ཚིག
+changeCreds.newPassword=གསང་ཚིག་གསར་པ།
+changeCreds.confirmNewPassword=གསང་ཚིག་གསར་པ་ངོས་སྦྱོར།
+changeCreds.submit=འགྱུར་བ་ཕུལ་བ།
 
 
 
-account.title=Account Settings
-account.accountSettings=Account Settings
-account.adminSettings=Admin Settings - View and Add Users
-account.userControlSettings=User Control Settings
-account.changeUsername=Change Username
-account.newUsername=New Username
-account.password=Confirmation Password
-account.oldPassword=Old password
-account.newPassword=New Password
-account.changePassword=Change Password
-account.confirmNewPassword=Confirm New Password
-account.signOut=Sign Out
-account.yourApiKey=Your API Key
-account.syncTitle=Sync browser settings with Account
-account.settingsCompare=Settings Comparison:
-account.property=Property
-account.webBrowserSettings=Web Browser Setting
-account.syncToBrowser=Sync Account -> Browser
-account.syncToAccount=Sync Account <- Browser
+account.title=ཐོ་མིང་སྒྲིག་འགོད།
+account.accountSettings=ཐོ་མིང་སྒྲིག་འགོད།
+account.adminSettings=དོ་དམ་པའི་སྒྲིག་འགོད། - སྤྱོད་མཁན་ལྟ་བ་དང་སྣོན་པ།
+account.userControlSettings=སྤྱོད་མཁན་ཚོད་འཛིན་སྒྲིག་འགོད།
+account.changeUsername=སྤྱོད་མཁན་མིང་བསྒྱུར་བ།
+account.newUsername=སྤྱོད་མཁན་མིང་གསར་པ།
+account.password=གསང་ཚིག་ངོས་སྦྱོར།
+account.oldPassword=གསང་ཚིག་རྙིང་པ།
+account.newPassword=གསང་ཚིག་གསར་པ།
+account.changePassword=གསང་ཚིག་བསྒྱུར་བ།
+account.confirmNewPassword=གསང་ཚིག་གསར་པ་ངོས་སྦྱོར།
+account.signOut=ཕྱིར་འབུད།
+account.yourApiKey=ཁྱེད་ཀྱི་ API ལྡེ་མིག
+account.syncTitle=བཤར་ཆས་སྒྲིག་འགོད་ཐོ་མིང་དང་མཉམ་བགྲོད།
+account.settingsCompare=སྒྲིག་འགོད་བསྡུར་བ།
+account.property=ཁྱད་ཆོས།
+account.webBrowserSettings=བཤར་ཆས་སྒྲིག་འགོད།
+account.syncToBrowser=མཉམ་བགྲོད་ཐོ་མིང་ -> བཤར་ཆས།
+account.syncToAccount=མཉམ་བགྲོད་ཐོ་མིང་ <- བཤར་ཆས།
 account.adminTitle=Administrator Tools
 account.adminNotif=You have admin privileges. Access system settings and user management.
 
 
-adminUserSettings.title=User Control Settings
-adminUserSettings.header=Admin User Control Settings
-adminUserSettings.admin=Admin
-adminUserSettings.user=User
-adminUserSettings.addUser=Add New User
-adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
-adminUserSettings.usernameInfo=Username can only contain letters, numbers and the following special characters @._+- or must be a valid email address.
-adminUserSettings.role=Role
-adminUserSettings.actions=Actions
-adminUserSettings.apiUser=Limited API User
-adminUserSettings.extraApiUser=Additional Limited API User
-adminUserSettings.webOnlyUser=Web Only User
-adminUserSettings.demoUser=Demo User (No custom settings)
-adminUserSettings.internalApiUser=Internal API User
-adminUserSettings.forceChange=Force user to change password on login
-adminUserSettings.submit=Save User
-adminUserSettings.changeUserRole=Change User's Role
-adminUserSettings.authenticated=Authenticated
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
+adminUserSettings.title=སྤྱོད་མཁན་ཚོད་འཛིན་སྒྲིག་འགོད།
+adminUserSettings.header=དོ་དམ་པའི་སྤྱོད་མཁན་ཚོད་འཛིན་སྒྲིག་འགོད།
+adminUserSettings.admin=དོ་དམ་པ།
+adminUserSettings.user=སྤྱོད་མཁན།
+adminUserSettings.addUser=སྤྱོད་མཁན་གསར་པ་སྣོན།
+adminUserSettings.deleteUser=སྤྱོད་མཁན་སུབ་པ།
+adminUserSettings.confirmDeleteUser=སྤྱོད་མཁན་སུབ་དགོས་སམ།
+adminUserSettings.confirmChangeUserStatus=སྤྱོད་མཁན་སྤྱོད་མི་ཆོག་པའམ་སྤྱོད་ཆོག་པ་བཟོ་དགོས་སམ།
+adminUserSettings.usernameInfo=སྤྱོད་མཁན་མིང་ནང་ཡི་གེ་དང་ཨང་ཀི། དམིགས་བསལ་མཚོན་རྟགས་ @._+- ཡང་ན་གློག་འཕྲིན་ཁ་བྱང་ཚད་ལྡན་ཞིག་དགོས།
+adminUserSettings.role=འགན་འཁུར།
+adminUserSettings.actions=བྱ་སྤྱོད།
+adminUserSettings.apiUser=ཚད་བཀག་ཅན་གྱི་ API སྤྱོད་མཁན།
+adminUserSettings.extraApiUser=ཚད་བཀག་ཅན་གྱི་ API སྤྱོད་མཁན་འཕར་མ།
+adminUserSettings.webOnlyUser=དྲ་ཚིགས་ཁོ་ནའི་སྤྱོད་མཁན།
+adminUserSettings.demoUser=བརྟག་དཔྱད་སྤྱོད་མཁན། (རང་སྒྲིག་མེད་པ།)
+adminUserSettings.internalApiUser=ནང་ཁུལ་ API སྤྱོད་མཁན།
+adminUserSettings.forceChange=ནང་འཛུལ་སྐབས་གསང་ཚིག་བསྒྱུར་དགོས་པ་བཟོ་བ།
+adminUserSettings.submit=སྤྱོད་མཁན་ཉར་ཚགས།
+adminUserSettings.changeUserRole=སྤྱོད་མཁན་གྱི་འགན་འཁུར་བསྒྱུར་བ།
+adminUserSettings.authenticated=ར་སྤྲོད་བྱས་ཟིན།
+adminUserSettings.editOwnProfil=རང་ཉིད་ཀྱི་སྤྱོད་མཁན་ཡིག་ཆ་རྩོམ་སྒྲིག
+adminUserSettings.enabledUser=སྤྱོད་ཆོག་པའི་སྤྱོད་མཁན།
+adminUserSettings.disabledUser=སྤྱོད་མི་ཆོག་པའི་སྤྱོད་མཁན།
+adminUserSettings.activeUsers=འགུལ་བཞིན་པའི་སྤྱོད་མཁན།
+adminUserSettings.disabledUsers=སྤྱོད་མི་ཆོག་པའི་སྤྱོད་མཁན།
+adminUserSettings.totalUsers=སྤྱོད་མཁན་ཁྱོན་བསྡོམས།
+adminUserSettings.lastRequest=རེ་ཞུ་མཐའ་མ།
 adminUserSettings.usage=View Usage
 adminUserSettings.teams=View/Edit Teams
 adminUserSettings.team=Team
@@ -448,38 +449,38 @@ endpointStatistics.numberOfVisits=Number of Visits
 endpointStatistics.visitsTooltip=Visits: {0} ({1}% of total)
 endpointStatistics.retry=Retry
 
-database.title=Database Import/Export
-database.header=Database Import/Export
-database.fileName=File Name
-database.creationDate=Creation Date
-database.fileSize=File Size
-database.deleteBackupFile=Delete Backup File
-database.importBackupFile=Import Backup File
-database.createBackupFile=Create Backup File
-database.downloadBackupFile=Download Backup File
-database.info_1=When importing data, it is crucial to ensure the correct structure. If you are unsure of what you are doing, seek advice and support from a professional. An error in the structure can cause application malfunctions, up to and including the complete inability to run the application.
-database.info_2=The file name does not matter when uploading. It will be renamed afterward to follow the format backup_user_yyyyMMddHHmm.sql, ensuring a consistent naming convention.
-database.submit=Import Backup
-database.importIntoDatabaseSuccessed=Import into database successed
-database.backupCreated=Database backup successful
-database.fileNotFound=File not found
-database.fileNullOrEmpty=File must not be null or empty
-database.failedImportFile=Failed to import file
-database.notSupported=This function is not available for your database connection.
+database.title=གཞི་གྲངས་མཛོད་ནང་འདྲེན་/ཕྱིར་འདྲེན།
+database.header=གཞི་གྲངས་མཛོད་ནང་འདྲེན་/ཕྱིར་འདྲེན།
+database.fileName=ཡིག་ཆའི་མིང་།
+database.creationDate=བཟོ་བའི་དུས་ཚོད།
+database.fileSize=ཡིག་ཆའི་ཆེ་ཆུང་།
+database.deleteBackupFile=གྲབས་ཉར་ཡིག་ཆ་སུབ་པ།
+database.importBackupFile=གྲབས་ཉར་ཡིག་ཆ་ནང་འདྲེན།
+database.createBackupFile=གྲབས་ཉར་ཡིག་ཆ་བཟོ་བ།
+database.downloadBackupFile=གྲབས་ཉར་ཡིག་ཆ་ཕབ་ལེན།
+database.info_1=གཞི་གྲངས་ནང་འདྲེན་སྐབས་བཀོད་པ་ཏག་ཏག་ཡིན་པ་ངེས་པར་དུ་བྱེད་དགོས། གལ་སྲིད་ཁྱེད་རང་གང་བྱེད་བཞིན་པ་མི་ཤེས་ན། ཆེད་ལས་པ་ཞིག་ལས་ལམ་སྟོན་དང་རྒྱབ་སྐྱོར་ཞུ་རོགས། བཀོད་པའི་ནང་ནོར་འཁྲུལ་ཡོད་ན་མཉེན་ཆས་ལ་སྐྱོན་ཤོར་སྲིད་པ་དང་། ཐ་ན་མཉེན་ཆས་གཏན་ནས་འཁོར་སྐྱོད་བྱེད་མི་ཐུབ་པའང་ཡོང་སྲིད།
+database.info_2=ཡིག་ཆ་ཡར་འཇུག་སྐབས་ཡིག་ཆའི་མིང་ལ་ཁྱད་པར་མེད། དེའི་རྗེས་སུ་ backup_user_yyyyMMddHHmm.sql ཞེས་པའི་རྣམ་པར་མིང་བསྐྱར་འདོགས་བྱ་རྒྱུ་ཡིན་པས། མིང་འདོགས་སྟངས་གཅིག་མཚུངས་ཡིན་པ་ངེས་པར་བྱེད་ཐུབ།
+database.submit=གྲབས་ཉར་ནང་འདྲེན།
+database.importIntoDatabaseSuccessed=གཞི་གྲངས་མཛོད་དུ་ནང་འདྲེན་ལེགས་གྲུབ།
+database.backupCreated=གཞི་གྲངས་མཛོད་གྲབས་ཉར་ལེགས་གྲུབ།
+database.fileNotFound=ཡིག་ཆ་རྙེད་མ་བྱུང་།
+database.fileNullOrEmpty=ཡིག་ཆ་སྟོང་པའམ་མེད་པ་ཡིན་མི་ཆོག
+database.failedImportFile=ཡིག་ཆ་ནང་འདྲེན་ཕམ་པ།
+database.notSupported=སྡུད་གཞི་རྒྱབ་སྐྱོར་མི་བྱེད།
 
-session.expired=Your session has expired. Please refresh the page and try again.
-session.refreshPage=Refresh Page
+session.expired=ཁྱེད་ཀྱི་གླེང་མོལ་དུས་ཡོལ་ཟིན། ཤོག་ངོས་གསར་སྒྱུར་བྱས་ནས་ཡང་བསྐྱར་ཚོད་ལྟ་བྱེད་རོགས།
+session.refreshPage=ཤོག་ངོས་གསར་སྒྱུར།
 
 #############
 # HOME-PAGE #
 #############
-home.desc=Your locally hosted one-stop-shop for all your PDF needs.
-home.searchBar=Search for features...
+home.desc=ཁྱེད་ཀྱི་ PDF དགོས་མཁོ་ཚང་མའི་ཆེད་དུ་ས་གནས་རང་དུ་བཞག་པའི་ཞབས་ཞུ་ཁང་།
+home.searchBar=ནུས་པ་འཚོལ་བཤེར།
 
 
 home.viewPdf.title=View/Edit PDF
-home.viewPdf.desc=View, annotate, draw, add text or images
-viewPdf.tags=view,read,annotate,text,image,highlight,edit
+home.viewPdf.desc=ལྟ་བ། མཆན་འགྲེལ། ཡི་གེ་དང་པར་རིས་སྣོན་པ།
+viewPdf.tags=ལྟ་བ།,ཀློག་པ།,མཆན་འགྲེལ།,ཡི་གེ,པར་རིས།
 
 home.setFavorites=Set Favourites
 home.hideFavorites=Hide Favourites
@@ -490,189 +491,189 @@ home.alphabetical=Alphabetical
 home.globalPopularity=Global Popularity
 home.sortBy=Sort by:
 
-home.multiTool.title=PDF Multi Tool
-home.multiTool.desc=Merge, Rotate, Rearrange, Split, and Remove pages
-multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side,interactive,intractable,move,delete,migrate,divide
+home.multiTool.title=PDF ལག་ཆ་མང་པོ།
+home.multiTool.desc=སྡེབ་སྦྱོར། འཁོར་སྐྱོད། བསྐྱར་སྒྲིག ཁ་གྱེས། དང་ཤོག་ངོས་སུབ་པ།
+multiTool.tags=ལག་ཆ་མང་པོ།,བཀོལ་སྤྱོད་མང་པོ།,UI,མཐེབ་གནོན་འཐེན་པ།,མདུན་ངོས།,མཁོ་མཁན་ཕྱོགས།,སྤྱོད་སྒོ།,འགུལ་སྐྱོད།,སུབ་པ།,གནས་སྤོ།,བགོ་བ།
 
-home.merge.title=Merge
-home.merge.desc=Easily merge multiple PDFs into one.
-merge.tags=merge,Page operations,Back end,server side
+home.merge.title=སྡེབ་སྦྱོར།
+home.merge.desc=PDF མང་པོ་གཅིག་ཏུ་སྡེབ་སྦྱོར་བྱེད་པ།
+merge.tags=སྡེབ་སྦྱོར།,ཤོག་ངོས་བཀོལ་སྤྱོད།,རྒྱབ་ངོས།,ཞབས་ཞུ་ཕྱོགས།
 
-home.split.title=Split
-home.split.desc=Split PDFs into multiple documents
-split.tags=Page operations,divide,Multi Page,cut,server side
+home.split.title=ཁ་གྱེས།
+home.split.desc=PDF ཡིག་ཆ་མང་པོར་བགོ་བ།
+split.tags=ཤོག་ངོས་བཀོལ་སྤྱོད།,བགོ་བ།,ཤོག་ངོས་མང་པོ།,གཅོད་པ།,ཞབས་ཞུ་ཕྱོགས།
 
-home.rotate.title=Rotate
-home.rotate.desc=Easily rotate your PDFs.
-rotate.tags=server side
+home.rotate.title=འཁོར་སྐྱོད།
+home.rotate.desc=PDF ལས་སླ་པོའི་ངང་འཁོར་སྐྱོད་བྱེད་པ།
+rotate.tags=ཞབས་ཞུ་ཕྱོགས།
 
 
-home.imageToPdf.title=Image to PDF
-home.imageToPdf.desc=Convert a image (PNG, JPEG, GIF) to PDF.
-imageToPdf.tags=conversion,img,jpg,picture,photo
+home.imageToPdf.title=པར་རིས་ནས་ PDF ལ།
+home.imageToPdf.desc=པར་རིས་ (PNG, JPEG, GIF) ནས་ PDF ལ་བསྒྱུར་བ།
+imageToPdf.tags=བསྒྱུར་བ།,པར་རིས།,jpg,པར།,འདྲ་པར།
 
-home.pdfToImage.title=PDF to Image
-home.pdfToImage.desc=Convert a PDF to a image. (PNG, JPEG, GIF)
-pdfToImage.tags=conversion,img,jpg,picture,photo
+home.pdfToImage.title=PDF ནས་པར་རིས་ལ།
+home.pdfToImage.desc=PDF ནས་པར་རིས་ (PNG, JPEG, GIF) ལ་བསྒྱུར་བ།
+pdfToImage.tags=བསྒྱུར་བ།,པར་རིས།,jpg,པར།,འདྲ་པར།
 
-home.pdfOrganiser.title=Organise
-home.pdfOrganiser.desc=Remove/Rearrange pages in any order
-pdfOrganiser.tags=duplex,even,odd,sort,move
+home.pdfOrganiser.title=གོ་སྒྲིག
+home.pdfOrganiser.desc=ཤོག་ངོས་རྣམས་གོ་རིམ་གང་རུང་དུ་སུབ་པའམ་བསྐྱར་སྒྲིག་བྱེད་པ།
+pdfOrganiser.tags=ཤོག་ངོས་གཉིས་མ།,ཨང་གྲངས་ཟུང་ལྡན།,ཨང་གྲངས་ཡ་གྲངས།,གོ་རིམ་སྒྲིག་པ།,སྤོ་བ།
 
 
-home.addImage.title=Add image
-home.addImage.desc=Adds a image onto a set location on the PDF
-addImage.tags=img,jpg,picture,photo
+home.addImage.title=པར་རིས་སྣོན་པ།
+home.addImage.desc=PDF ནང་གནས་ས་ངེས་ཅན་ཞིག་ཏུ་པར་རིས་སྣོན་པ།
+addImage.tags=པར་རིས།,jpg,པར།,འདྲ་པར།
 
-home.watermark.title=Add Watermark
-home.watermark.desc=Add a custom watermark to your PDF document.
-watermark.tags=Text,repeating,label,own,copyright,trademark,img,jpg,picture,photo
+home.watermark.title=ཆུ་རྟགས་སྣོན་པ།
+home.watermark.desc=PDF ཡིག་ཆར་རང་སྒྲིག་གི་ཆུ་རྟགས་སྣོན་པ།
+watermark.tags=ཡི་གེ,བསྐྱར་ཟློས།,ཁ་ཡིག,རང་དབང་།,པར་དབང་།,ཚོང་རྟགས།,པར་རིས།,jpg,པར།,འདྲ་པར།
 
-home.permissions.title=Change Permissions
-home.permissions.desc=Change the permissions of your PDF document
-permissions.tags=read,write,edit,print
+home.permissions.title=ཆོག་མཆན་བསྒྱུར་བ།
+home.permissions.desc=PDF ཡིག་ཆའི་ཆོག་མཆན་བསྒྱུར་བ།
+permissions.tags=ཀློག་པ།,འབྲི་བ།,རྩོམ་སྒྲིག,པར་འདེབས།
 
 
-home.removePages.title=Remove
-home.removePages.desc=Delete unwanted pages from your PDF document.
-removePages.tags=Remove pages,delete pages
+home.removePages.title=སུབ་པ།
+home.removePages.desc=PDF ཡིག་ཆ་ནས་མི་དགོས་པའི་ཤོག་ངོས་རྣམས་སུབ་པ།
+removePages.tags=ཤོག་ངོས་སུབ་པ།,ཤོག་ངོས་གསུབ་པ།
 
-home.addPassword.title=Add Password
-home.addPassword.desc=Encrypt your PDF document with a password.
-addPassword.tags=secure,security
+home.addPassword.title=གསང་ཚིག་སྣོན་པ།
+home.addPassword.desc=PDF ཡིག་ཆར་གསང་ཚིག་གིས་གསང་སྡོམ་བྱེད་པ།
+addPassword.tags=བདེ་འཇགས།,ཉེན་སྲུང་།
 
-home.removePassword.title=Remove Password
-home.removePassword.desc=Remove password protection from your PDF document.
-removePassword.tags=secure,Decrypt,security,unpassword,delete password
+home.removePassword.title=གསང་ཚིག་སུབ་པ།
+home.removePassword.desc=PDF ཡིག་ཆ་ནས་གསང་ཚིག་སྲུང་སྐྱོབ་སུབ་པ།
+removePassword.tags=བདེ་འཇགས།,གསང་སྡོམ་གྲོལ་བ།,ཉེན་སྲུང་།,གསང་ཚིག་མེད་པ།,གསང་ཚིག་སུབ་པ།
 
-home.compressPdfs.title=Compress
-home.compressPdfs.desc=Compress PDFs to reduce their file size.
-compressPdfs.tags=squish,small,tiny
+home.compressPdfs.title=སྡུད་སྒྲིལ།
+home.compressPdfs.desc=ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ PDF སྡུད་སྒྲིལ་བྱེད་པ།
+compressPdfs.tags=བསྡུས་པ།,ཆུང་ཆུང་།,ཆུང་ཆུང་།
 
 home.unlockPDFForms.title=Unlock PDF Forms
 home.unlockPDFForms.desc=Remove read-only property of form fields in a PDF document.
 unlockPDFForms.tags=remove,delete,form,field,readonly
 
-home.changeMetadata.title=Change Metadata
-home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+home.changeMetadata.title=གནས་ཆ་སྒྱུར་བཅོས།
+home.changeMetadata.desc=PDF ཡིག་ཆ་ནས་གནས་ཆ་བསྒྱུར་བའམ་སུབ་པ།སྣོན་པ།
+changeMetadata.tags=ཁ་བྱང་།,རྩོམ་པ་པོ།,ཚེས་གྲངས།,བཟོ་བ།,དུས་ཚོད།,པར་སྐྲུན་པ།,ཐོན་སྐྱེད་པ།,སྡོམ་རྩིས།
 
-home.fileToPDF.title=Convert file to PDF
-home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)
-fileToPDF.tags=transformation,format,document,picture,slide,text,conversion,office,docs,word,excel,powerpoint
+home.fileToPDF.title=ཡིག་ཆ་ནས་ PDF ལ་བསྒྱུར་བ།
+home.fileToPDF.desc=ཡིག་ཆ་ཕལ་ཆེ་བ་ PDF ལ་བསྒྱུར་ཐུབ། (DOCX, PNG, XLS, PPT, TXT སོགས།)
+fileToPDF.tags=བསྒྱུར་བཅོས།,རྣམ་གཞག,ཡིག་ཆ།,པར།,སྟོན་བྱེད།,ཡི་གེ,བསྒྱུར་བ།,ཡིག་ཚང་།,docs,word,excel,powerpoint
 
-home.ocr.title=OCR / Cleanup scans
-home.ocr.desc=Cleanup scans and detects text from images within a PDF and re-adds it as text.
-ocr.tags=recognition,text,image,scan,read,identify,detection,editable
+home.ocr.title=OCR / བཤེར་འབེབས་གཙང་སེལ།
+home.ocr.desc=བཤེར་འབེབས་གཙང་སེལ་དང་ PDF ནང་གི་པར་རིས་ནས་ཡི་གེ་ངོས་འཛིན་བྱས་ཏེ་ཡི་གེའི་རྣམ་པར་བསྐྱར་སྣོན་བྱེད་པ།
+ocr.tags=ངོས་འཛིན།,ཡི་གེ,པར་རིས།,བཤེར་འབེབས།,ཀློག་པ།,ངོས་འཛིན།,འཚོལ་ཞིབ།,རྩོམ་སྒྲིག་རུང་བ།
 
-home.extractImages.title=Extract Images
-home.extractImages.desc=Extracts all images from a PDF and saves them to zip
-extractImages.tags=picture,photo,save,archive,zip,capture,grab
+home.extractImages.title=པར་རིས་ཕྱིར་འདོན།
+home.extractImages.desc=PDF ནས་པར་རིས་ཚང་མ་ཕྱིར་བཏོན་ནས་ zip ནང་ཉར་ཚགས་བྱེད་པ།
+extractImages.tags=པར།,འདྲ་པར།,ཉར་ཚགས།,ཡིག་མཛོད།,zip,འཛིན་པ།,ལེན་པ།
 
-home.pdfToPDFA.title=PDF to PDF/A
-home.pdfToPDFA.desc=Convert PDF to PDF/A for long-term storage
-pdfToPDFA.tags=archive,long-term,standard,conversion,storage,preservation
+home.pdfToPDFA.title=PDF ནས་ PDF/A ལ།
+home.pdfToPDFA.desc=PDF ནས་དུས་ཡུན་རིང་པོའི་ཉར་ཚགས་ཆེད་ PDF/A ལ་བསྒྱུར་བ།
+pdfToPDFA.tags=ཡིག་མཛོད།,དུས་ཡུན་རིང་པོ།,ཚད་ལྡན།,བསྒྱུར་བ།,ཉར་ཚགས།,སྲུང་སྐྱོབ།
 
-home.PDFToWord.title=PDF to Word
-home.PDFToWord.desc=Convert PDF to Word formats (DOC, DOCX and ODT)
-PDFToWord.tags=doc,docx,odt,word,transformation,format,conversion,office,microsoft,docfile
+home.PDFToWord.title=PDF ནས་ Word ལ།
+home.PDFToWord.desc=PDF ནས་ Word རྣམ་གཞག་ (DOC, DOCX དང་ ODT) ལ་བསྒྱུར་བ།
+PDFToWord.tags=doc,docx,odt,word,བསྒྱུར་བཅོས།,རྣམ་གཞག,བསྒྱུར་བ།,ཡིག་ཚང་།,microsoft,docfile
 
-home.PDFToPresentation.title=PDF to Presentation
-home.PDFToPresentation.desc=Convert PDF to Presentation formats (PPT, PPTX and ODP)
-PDFToPresentation.tags=slides,show,office,microsoft
+home.PDFToPresentation.title=PDF ནས་སྟོན་བྱེད་ལ།
+home.PDFToPresentation.desc=PDF ནས་སྟོན་བྱེད་རྣམ་གཞག་ (PPT, PPTX དང་ ODP) ལ་བསྒྱུར་བ།
+PDFToPresentation.tags=སྟོན་བྱེད།,འཁྲབ་སྟོན།,ཡིག་ཚང་།,microsoft
 
-home.PDFToText.title=PDF to RTF (Text)
-home.PDFToText.desc=Convert PDF to Text or RTF format
+home.PDFToText.title=PDF ནས་ RTF (ཡི་གེ) ལ།
+home.PDFToText.desc=PDF ནས་ཡི་གེའམ་ RTF རྣམ་གཞག་ལ་བསྒྱུར་བ།
 PDFToText.tags=richformat,richtextformat,rich text format
 
-home.PDFToHTML.title=PDF to HTML
-home.PDFToHTML.desc=Convert PDF to HTML format
-PDFToHTML.tags=web content,browser friendly
+home.PDFToHTML.title=PDF ནས་ HTML ལ།
+home.PDFToHTML.desc=PDF ནས་ HTML རྣམ་གཞག་ལ་བསྒྱུར་བ།
+PDFToHTML.tags=དྲ་ངོས་ནང་དོན།,བཤར་ཆས་འཆམ་མཐུན།
 
 
-home.PDFToXML.title=PDF to XML
-home.PDFToXML.desc=Convert PDF to XML format
-PDFToXML.tags=data-extraction,structured-content,interop,transformation,convert
+home.PDFToXML.title=PDF ནས་ XML ལ།
+home.PDFToXML.desc=PDF ནས་ XML རྣམ་གཞག་ལ་བསྒྱུར་བ།
+PDFToXML.tags=གཞི་གྲངས་ཕྱིར་འདོན།,སྒྲོམ་གཞི་ཅན་གྱི་ནང་དོན།,མཉམ་འབྲེལ།,བསྒྱུར་བཅོས།,བསྒྱུར་བ།
 
-home.ScannerImageSplit.title=Detect/Split Scanned photos
-home.ScannerImageSplit.desc=Splits multiple photos from within a photo/PDF
-ScannerImageSplit.tags=separate,auto-detect,scans,multi-photo,organize
+home.ScannerImageSplit.title=བཤེར་པར་ངོས་འཛིན་/ཁ་གྱེས།
+home.ScannerImageSplit.desc=པར་རིས་/PDF ནང་གི་པར་མང་པོ་ཁ་གྱེས་བྱེད་པ།
+ScannerImageSplit.tags=ཁ་གྱེས།,རང་འགུལ་ངོས་འཛིན།,བཤེར་འབེབས།,པར་མང་པོ།,གོ་སྒྲིག
 
-home.sign.title=Sign
-home.sign.desc=Adds signature to PDF by drawing, text or image
-sign.tags=authorize,initials,drawn-signature,text-sign,image-signature
+home.sign.title=མིང་རྟགས།
+home.sign.desc=རི་མོ། ཡི་གེ། པར་རིས་བཅས་ཀྱི་སྒོ་ནས་ PDF ལ་མིང་རྟགས་སྣོན་པ།
+sign.tags=དབང་སྤྲོད།,མིང་རྟགས་ཐུང་ངུ་།,བྲིས་པའི་མིང་རྟགས།,ཡི་གེའི་མིང་རྟགས།,པར་རིས་མིང་རྟགས།
 
-home.flatten.title=Flatten
-home.flatten.desc=Remove all interactive elements and forms from a PDF
-flatten.tags=static,deactivate,non-interactive,streamline
+home.flatten.title=སྙོམས་པ།
+home.flatten.desc=PDF ནས་སྤྱོད་སྒོ་ཅན་གྱི་ཆ་ཤས་དང་འགེངས་ཤོག་ཚང་མ་སུབ་པ།
+flatten.tags=སྙོམས་པ།,འགེངས་ཤོག,སྤྱོད་སྒོ།,ཆ་ཤས།,སུབ་པ།
 
-home.repair.title=Repair
-home.repair.desc=Tries to repair a corrupt/broken PDF
-repair.tags=fix,restore,correction,recover
+home.repair.title=བཟོ་བཅོས།
+home.repair.desc=སྐྱོན་ཤོར་བའམ་གཏོར་བཤིག་ཐེབས་པའི་ PDF བཟོ་བཅོས་བྱེད་ཐབས་བྱེད་པ།
+repair.tags=སྐྱོན་སེལ།,བཟོ་བཅོས།,གསོ་བ།,ལེགས་བཅོས།
 
-home.removeBlanks.title=Remove Blank pages
-home.removeBlanks.desc=Detects and removes blank pages from a document
-removeBlanks.tags=cleanup,streamline,non-content,organize
+home.removeBlanks.title=སྟོང་ཤོག་སུབ་པ།
+home.removeBlanks.desc=PDF ནང་གི་སྟོང་ཤོག་རང་འགུལ་ངོས་འཛིན་དང་སུབ་པ།
+removeBlanks.tags=སྟོང་ཤོག་སུབ་པ། སྟོང་པ་སུབ་པ། དཀར་ཤོག་སུབ་པ། PDF སྟོང་ཤོག་སུབ་པ།
 
-home.removeAnnotations.title=Remove Annotations
-home.removeAnnotations.desc=Removes all comments/annotations from a PDF
-removeAnnotations.tags=comments,highlight,notes,markup,remove
+home.removeAnnotations.title=མཆན་འགྲེལ་སུབ་པ།
+home.removeAnnotations.desc=PDF ནང་གི་མཆན་འགྲེལ་ཚང་མ་སུབ་པ།
+removeAnnotations.tags=མཆན་འགྲེལ་སུབ་པ། དཔྱད་བརྗོད་སུབ་པ། མཆན་བུ་སུབ་པ། PDF མཆན་འགྲེལ་སུབ་པ།
 
-home.compare.title=Compare
-home.compare.desc=Compares and shows the differences between 2 PDF Documents
-compare.tags=differentiate,contrast,changes,analysis
+home.compare.title=PDF བསྡུར་བ།
+home.compare.desc=PDF ཡིག་ཆ་གཉིས་ཀྱི་ཁྱད་པར་བསྡུར་བ།
+compare.tags=བསྡུར་བ། ཁྱད་པར། ཞིབ་བསྡུར། གཤིབ་བསྡུར། PDF བསྡུར་བ།
 
-home.certSign.title=Sign with Certificate
-home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
-certSign.tags=authenticate,PEM,P12,official,encrypt
+home.certSign.title=ལག་ཁྱེར་མིང་རྟགས།
+home.certSign.desc=ལག་ཁྱེར་/ལྡེ་མིག་ (PEM/P12) གྱིས་ PDF ལ་མིང་རྟགས་རྒྱག་པ།
+certSign.tags=ར་སྤྲོད།,PEM,P12,གཞུང་འབྲེལ།,གསང་སྡོམ།
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=ལག་ཁྱེར་མིང་རྟགས་སུབ་པ།
+home.removeCertSign.desc=PDF ནས་ལག་ཁྱེར་མིང་རྟགས་སུབ་པ།
+removeCertSign.tags=ར་སྤྲོད།,PEM,P12,གཞུང་འབྲེལ།,གསང་སྡོམ་གྲོལ་བ།
 
-home.pageLayout.title=Multi-Page Layout
-home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
-pageLayout.tags=merge,composite,single-view,organize
+home.pageLayout.title=ཤོག་ངོས་མང་པོའི་བཀོད་པ།
+home.pageLayout.desc=PDF ཡིག་ཆའི་ཤོག་ངོས་མང་པོ་ཤོག་ངོས་གཅིག་ཏུ་སྡེབ་སྦྱོར་བྱེད་པ།
+pageLayout.tags=སྡེབ་སྦྱོར།,བསྡུས་པ།,ལྟ་ཚུལ་གཅིག,གོ་སྒྲིག
 
-home.scalePages.title=Adjust page size/scale
-home.scalePages.desc=Change the size/scale of a page and/or its contents.
-scalePages.tags=resize,modify,dimension,adapt
+home.scalePages.title=ཤོག་ངོས་ཆེ་ཆུང་/ཚད་སྒྲིག་པ།
+home.scalePages.desc=ཤོག་ངོས་དང་/ཡང་ན་དེའི་ནང་དོན་གྱི་ཆེ་ཆུང་/ཚད་བསྒྱུར་བ།
+scalePages.tags=ཆེ་ཆུང་བསྐྱར་སྒྲིག,བཟོ་བཅོས།,ཚད་གཞི།,བསྟུན་འགྱུར།
 
-home.pipeline.title=Pipeline
-home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
-pipeline.tags=automate,sequence,scripted,batch-process
+home.pipeline.title=བརྒྱུད་རིམ།
+home.pipeline.desc=བརྒྱུད་རིམ་འཁྲབ་གཞུང་བཟོས་ནས་ PDF ལ་བྱ་བ་མང་པོ་འཁོར་སྐྱོད་བྱེད་པ།
+pipeline.tags=རང་འགུལ།,རིམ་པ།,འཁྲབ་གཞུང་།,ཆ་ཚང་བཀོལ་སྤྱོད།
 
-home.add-page-numbers.title=Add Page Numbers
-home.add-page-numbers.desc=Add Page numbers throughout a document in a set location
-add-page-numbers.tags=paginate,label,organize,index
+home.add-page-numbers.title=ཤོག་གྲངས་སྣོན་པ།
+home.add-page-numbers.desc=ཡིག་ཆའི་ནང་གནས་ས་ངེས་ཅན་དུ་ཤོག་གྲངས་སྣོན་པ།
+add-page-numbers.tags=ཤོག་གྲངས་རྒྱག་པ།,མིང་རྟགས།,གོ་སྒྲིག,དཀར་ཆག
 
-home.auto-rename.title=Auto Rename PDF File
-home.auto-rename.desc=Auto renames a PDF file based on its detected header
-auto-rename.tags=auto-detect,header-based,organize,relabel
+home.auto-rename.title=PDF ཡིག་ཆའི་མིང་རང་འགུལ་བསྐྱར་འདོགས།
+home.auto-rename.desc=ངོས་འཛིན་བྱས་པའི་འགོ་བརྗོད་ལ་གཞིགས་ནས་ PDF ཡིག་ཆའི་མིང་རང་འགུལ་བསྐྱར་འདོགས་བྱེད་པ།
+auto-rename.tags=རང་འགུལ་ངོས་འཛིན།,འགོ་བརྗོད་གཞིར་བཟུང་།,གོ་སྒྲིག,མིང་བསྐྱར་འདོགས།
 
-home.adjust-contrast.title=Adjust Colours/Contrast
-home.adjust-contrast.desc=Adjust Contrast, Saturation and Brightness of a PDF
-adjust-contrast.tags=color-correction,tune,modify,enhance,colour-correction
+home.adjust-contrast.title=ཚོས་གཞི་/འོད་ཁྱད་སྙོམ་སྒྲིག
+home.adjust-contrast.desc=PDF ཡི་འོད་ཁྱད། ཚོས་ཟིལ། དང་གསལ་ཚད་སྙོམ་སྒྲིག་བྱེད་པ།
+adjust-contrast.tags=ཚོས་གཞི་ལེགས་སྒྲིག,སྙོམ་སྒྲིག,བཟོ་བཅོས།,ཡར་རྒྱས།,ཚོས་མདངས་ལེགས་སྒྲིག
 
-home.crop.title=Crop PDF
-home.crop.desc=Crop a PDF to reduce its size (maintains text!)
-crop.tags=trim,shrink,edit,shape
+home.crop.title=PDF གཏུབ་གཅོད།
+home.crop.desc=ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ PDF གཏུབ་གཅོད་བྱེད་པ། (ཡི་གེ་རྣམས་སྲུང་སྐྱོབ་བྱེད་ཐུབ།)
+crop.tags=གཏུབ་པ།,ཆུང་དུ་གཏོང་བ།,རྩོམ་སྒྲིག,དབྱིབས།
 
-home.autoSplitPDF.title=Auto Split Pages
-home.autoSplitPDF.desc=Auto Split Scanned PDF with physical scanned page splitter QR Code
-autoSplitPDF.tags=QR-based,separate,scan-segment,organize
+home.autoSplitPDF.title=ཤོག་ངོས་རང་འགུལ་ཁ་གྱེས།
+home.autoSplitPDF.desc=བཤེར་འབེབས་བྱས་པའི་ PDF ནང་གི་དངོས་ཡོད་བཤེར་འབེབས་ཤོག་ངོས་ཁ་གྱེས་ QR Code བེད་སྤྱོད་བྱས་ནས་རང་འགུལ་ཁ་གྱེས་བྱེད་པ།
+autoSplitPDF.tags=QR གཞིར་བཟུང་།,ཁ་གྱེས།,བཤེར་དུམ།,གོ་སྒྲིག
 
-home.sanitizePdf.title=Sanitize
-home.sanitizePdf.desc=Remove scripts and other elements from PDF files
-sanitizePdf.tags=clean,secure,safe,remove-threats
+home.sanitizePdf.title=གཙང་སེལ།
+home.sanitizePdf.desc=PDF ཡིག་ཆ་ནས་འཁྲབ་གཞུང་དང་ཆ་ཤས་གཞན་དག་སུབ་པ།
+sanitizePdf.tags=གཙང་སེལ།,བདེ་འཇགས།,ཉེན་མེད།,ཉེན་ཁ་སེལ་བ།
 
-home.URLToPDF.title=URL/Website To PDF
-home.URLToPDF.desc=Converts any http(s)URL to PDF
-URLToPDF.tags=web-capture,save-page,web-to-doc,archive
+home.URLToPDF.title=དྲ��ཚིགས་ནས་ PDF ལ།
+home.URLToPDF.desc=http(s) དྲ་ཚིགས་གང་རུང་ PDF ལ་བསྒྱུར་བ།
+URLToPDF.tags=དྲ་ངོས་ལེན་པ།,ཤོག་ངོས་ཉར་ཚགས།,དྲ་ཚིགས་ཡིག་ཆ།,ཡིག་མཛོད།
 
-home.HTMLToPDF.title=HTML to PDF
-home.HTMLToPDF.desc=Converts any HTML file or zip to PDF
-HTMLToPDF.tags=markup,web-content,transformation,convert
+home.HTMLToPDF.title=HTML ནས་ PDF ལ།
+home.HTMLToPDF.desc=HTML ཡིག་ཆའམ་ zip ཡིག་ཆ་གང་རུང་ PDF ལ་བསྒྱུར་བ།
+HTMLToPDF.tags=རྟགས་རྒྱག,དྲ་ངོས་ནང་དོན།,བསྒྱུར་བཅོས།,བསྒྱུར་བ།
 
 #eml-to-pdf
 home.EMLToPDF.title=Email to PDF
@@ -691,95 +692,95 @@ EMLToPDF.troubleshootingTip1=Email to HTML is a more reliable process, so with b
 EMLToPDF.troubleshootingTip2=With a small number of Emails, if the PDF is malformed, you can download HTML and override some of the problematic HTML/CSS code.
 EMLToPDF.troubleshootingTip3=Embeddings, however, do not work with HTMLs
 
-home.MarkdownToPDF.title=Markdown to PDF
-home.MarkdownToPDF.desc=Converts any Markdown file to PDF
-MarkdownToPDF.tags=markup,web-content,transformation,convert,md
+home.MarkdownToPDF.title=Markdown ནས་ PDF ལ།
+home.MarkdownToPDF.desc=Markdown ཡིག་ཆ་གང་རུང་ PDF ལ་བསྒྱུར་བ།
+MarkdownToPDF.tags=རྟགས་རྒྱག,དྲ་ངོས་ནང་དོན།,བསྒྱུར་བཅོས།,བསྒྱུར་བ།
 
 home.PDFToMarkdown.title=PDF to Markdown
 home.PDFToMarkdown.desc=Converts any PDF to Markdown
 PDFToMarkdown.tags=markup,web-content,transformation,convert,md
 
-home.getPdfInfo.title=Get ALL Info on PDF
-home.getPdfInfo.desc=Grabs any and all information possible on PDFs
-getPdfInfo.tags=infomation,data,stats,statistics
+home.getPdfInfo.title=PDF ཡི་གནས་ཚུལ་ཆ་ཚང་ལེན་པ།
+home.getPdfInfo.desc=PDF ཡི་གནས་ཚུལ་ཡོད་ཚད་ལེན་པ།
+getPdfInfo.tags=གནས་ཚུལ།,གཞི་གྲངས།,སྡོམ་རྩིས།,གྲངས་ཐོ།
 
 
-home.extractPage.title=Extract page(s)
-home.extractPage.desc=Extracts select pages from PDF
-extractPage.tags=extract
+home.extractPage.title=ཤོག་ངོས་ཕྱིར་འདོན།
+home.extractPage.desc=PDF ནས་འདེམས་སྒྲུག་བྱས་པའི་ཤོག་ངོས་རྣམས་ཕྱིར་འདོན་པ།
+extractPage.tags=ཕྱིར་འདོན།
 
 
-home.PdfToSinglePage.title=PDF to Single Large Page
-home.PdfToSinglePage.desc=Merges all PDF pages into one large single page
-PdfToSinglePage.tags=single page
+home.PdfToSinglePage.title=PDF ནས་ཤོག་ངོས་ཆེན་པོ་གཅིག་ལ།
+home.PdfToSinglePage.desc=PDF ཡི་ཤོག་ངོས་ཚང་མ་ཤོག་ངོས་ཆེན་པོ་གཅིག་ཏུ་སྡེབ་སྦྱོར་བྱེད་པ།
+PdfToSinglePage.tags=ཤོག་ངོས་གཅིག
 
 
-home.showJS.title=Show Javascript
-home.showJS.desc=Searches and displays any JS injected into a PDF
+home.showJS.title=Javascript སྟོན་པ།
+home.showJS.desc=PDF ནང་དུ་བཅུག་པའི་ JS གང་ཡོད་འཚོལ་ཞིབ་དང་མངོན་སྟོན་བྱེད་པ།
 showJS.tags=JS
 
-home.autoRedact.title=Auto Redact
-home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
-autoRedact.tags=Redact,Hide,black out,black,marker,hidden
+home.autoRedact.title=རང་འགུལ་སྒྲིབ་སྲུང་།
+home.autoRedact.desc=འཇུག་པའི་ཡི་གེ་གཞིར་བཟུང་ནས་ PDF ནང་གི་ཡི་གེ་རྣམས་རང་འགུལ་གྱིས་སྒྲིབ་པ།
+autoRedact.tags=སྒྲིབ་སྲུང་།,སྦས་པ།,ནག་པོས་སྒྲིབ་པ།,ནག་པོ།,རྟགས་རྒྱག,སྦས་པ།
 
-home.redact.title=Manual Redaction
-home.redact.desc=Redacts a PDF based on selected text, drawn shapes and/or selected page(s)
-redact.tags=Redact,Hide,black out,black,marker,hidden,manual
+home.redact.title=ལག་བཟོས་སྒྲིབ་སྲུང་།
+home.redact.desc=འདེམས་སྒྲུག་བྱས་པའི་ཡི་གེ། བྲིས་པའི་དབྱིབས། དང་/ཡང་ན་འདེམས་སྒྲུག་བྱས་པའི་ཤོག་ངོས་གཞིར་བཟུང་ནས་ PDF སྒྲིབ་སྲུང་བྱེད་པ།
+redact.tags=སྒྲིབ་སྲུང་།,སྦས་པ།,ནག་པོས་སྒྲིབ་པ།,ནག་པོ།,རྟགས་རྒྱག,སྦས་པ།,ལག་བཟོས།
 
-home.tableExtraxt.title=PDF to CSV
-home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
-tableExtraxt.tags=CSV,Table Extraction,extract,convert
+home.tableExtraxt.title=PDF ནས་ CSV ལ།
+home.tableExtraxt.desc=PDF ནས་རེའུ་མིག་རྣམས་ CSV ལ་ཕྱིར་འདོན་པ།
+tableExtraxt.tags=CSV,རེའུ་མིག་ཕྱིར་འདོན།,ཕྱིར་འདོན།,བསྒྱུར་བ།
 
 
-home.autoSizeSplitPDF.title=Auto Split by Size/Count
-home.autoSizeSplitPDF.desc=Split a single PDF into multiple documents based on size, page count, or document count
-autoSizeSplitPDF.tags=pdf,split,document,organization
+home.autoSizeSplitPDF.title=ཆེ་ཆུང་/གྲངས་ཀ་ལྟར་རང་འགུལ་ཁ་གྱེས།
+home.autoSizeSplitPDF.desc=PDF གཅིག་ནས་ཡིག་ཆ་མང་པོར་ཆེ་ཆུང་། ཤོག་གྲངས། ཡང་ན་ཡིག་ཆའི་གྲངས་ཀ་གཞིར་བཟུང་ནས་ཁ་གྱེས་བྱེད་པ།
+autoSizeSplitPDF.tags=pdf,ཁ་གྱེས།,ཡིག་ཆ།,གོ་སྒྲིག
 
 
-home.overlay-pdfs.title=Overlay PDFs
-home.overlay-pdfs.desc=Overlays PDFs on-top of another PDF
-overlay-pdfs.tags=Overlay
+home.overlay-pdfs.title=PDF སྟེང་བརྩེགས།
+home.overlay-pdfs.desc=PDF གཞན་ཞིག་གི་སྟེང་དུ་ PDF བརྩེགས་པ།
+overlay-pdfs.tags=སྟེང་བརྩེགས།
 
-home.split-by-sections.title=Split PDF by Sections
-home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
-split-by-sections.tags=Section Split, Divide, Customize,Customise
+home.split-by-sections.title=དུམ་བུ་ལྟར་ PDF ཁ་གྱེས།
+home.split-by-sections.desc=PDF ཡི་ཤོག་ངོས་རེ་རེ་གཞུང་དང་འཕྲེད་ཀྱི་དུམ་བུ་ཆུང་ཆུང་དུ་བགོ་བ།
+split-by-sections.tags=དུམ་བུ་ཁ་གྱེས།,བགོ་བ།,རང་སྒྲིག,སྒྲིག་སྦྱོར།
 
-home.AddStampRequest.title=Add Stamp to PDF
-home.AddStampRequest.desc=Add text or add image stamps at set locations
-AddStampRequest.tags=Stamp, Add image, center image, Watermark, PDF, Embed, Customize,Customise
+home.AddStampRequest.title=PDF ལ་ཐེལ་ཙེ་སྣོན་པ།
+home.AddStampRequest.desc=གནས་ས་ངེས་ཅན་དུ་ཡི་གེའམ་པར་རིས་ཀྱི་ཐེལ་ཙེ་སྣོན་པ།
+AddStampRequest.tags=ཐེལ་ཙེ།,པར་རིས་སྣོན་པ།,དཀྱིལ་སྒྲིག་པར་རིས།,ཆུ་རྟགས།,PDF,ནང་འཇུག,རང་སྒྲིག,སྒྲིག་སྦྱོར།
 
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
+home.removeImagePdf.title=པར་རིས་སུབ་པ།
+home.removeImagePdf.desc=ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ PDF ནས་པར་རིས་སུབ་པ།
+removeImagePdf.tags=པར་རིས་སུབ་པ།,ཤོག་ངོས་བཀོལ་སྤྱོད།,རྒྱབ་ངོས།,ཞབས་ཞུ་ཕྱོགས།
 
 
-home.splitPdfByChapters.title=Split PDF by Chapters
-home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
-splitPdfByChapters.tags=split,chapters,bookmarks,organize
+home.splitPdfByChapters.title=ལེའུ་ལྟར་ PDF ཁ་གྱེས།
+home.splitPdfByChapters.desc=PDF ཡི་ལེའུའི་སྒྲོམ་གཞི་གཞིར་བཟུང་ནས་ཡིག་ཆ་མང་པོར་ཁ་གྱེས་བྱེད་པ།
+splitPdfByChapters.tags=ཁ་གྱེས།,ལེའུ།,དཔེ་རྟགས།,གོ་སྒྲིག
 
-home.validateSignature.title=Validate PDF Signature
-home.validateSignature.desc=Verify digital signatures and certificates in PDF documents
-validateSignature.tags=signature,verify,validate,pdf,certificate,digital signature,Validate Signature,Validate certificate
+home.validateSignature.title=PDF མིང་རྟགས་ར་སྤྲོད།
+home.validateSignature.desc=PDF ཡིག་ཆའི་ནང་གི་ཨང་ཀིའི་མིང་རྟགས་དང་ལག་ཁྱེར་ར་སྤྲོད་བྱེད་པ།
+validateSignature.tags=མིང་རྟགས།,ར་སྤྲོད།,ཆ་འཇོག,pdf,ལག་ཁྱེར།,ཨང་ཀིའི་མིང་རྟགས།,མིང་རྟགས་ར་སྤྲོད།,ལག་ཁྱེར་ར་སྤྲོད།
 
 #replace-invert-color
-replace-color.title=Advanced Colour options
-replace-color.header=Replace-Invert Colour PDF
-home.replaceColorPdf.title=Advanced Colour options
-home.replaceColorPdf.desc=Replace colour for text and background in PDF and invert full colour of pdf to reduce file size
-replaceColorPdf.tags=Replace Colour,Page operations,Back end,server side
-replace-color.selectText.1=Replace or Invert colour Options
-replace-color.selectText.2=Default(Default high contrast colours)
-replace-color.selectText.3=Custom(Customised colours)
-replace-color.selectText.4=Full-Invert(Invert all colours)
-replace-color.selectText.5=High contrast colour options
-replace-color.selectText.6=white text on black background
-replace-color.selectText.7=Black text on white background
-replace-color.selectText.8=Yellow text on black background
-replace-color.selectText.9=Green text on black background
-replace-color.selectText.10=Choose text Colour
-replace-color.selectText.11=Choose background Colour
-replace-color.submit=Replace
+replace-color.title=ཚོས་གཞིའི་གདམ་ག་མཐོ་རིམ།
+replace-color.header=ཚོས་གཞི་བརྗེ་སྒྱུར་-ལྡོག་སྒྱུར་ PDF
+home.replaceColorPdf.title=ཚོས་གཞིའི་གདམ་ག་མཐོ་རིམ།
+home.replaceColorPdf.desc=PDF ནང་གི་ཡི་གེ་དང་རྒྱབ་ལྗོངས་ཀྱི་ཚོས་གཞི་བརྗེ་སྒྱུར་བྱེད་པ་དང་ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ཚོས་གཞི་ཡོངས་རྫོགས་ལྡོག་སྒྱུར་བྱེད་པ།
+replaceColorPdf.tags=ཚོས་གཞི་བརྗེ་སྒྱུར།,ཤོག་ངོས་བཀོལ་སྤྱོད���,རྒྱབ་ངོས།,ཞབས་ཞུ་ཕྱོགས།
+replace-color.selectText.1=ཚོས་གཞི་བརྗེ་སྒྱུར་རམ་ལྡོག་སྒྱུར་གྱི་གདམ་ག
+replace-color.selectText.2=སྔོན་སྒྲིག (སྔོན་སྒྲིག་གི་འོད་ཁྱད་མཐོ་བའི་ཚོས་གཞི།)
+replace-color.selectText.3=རང་སྒྲིག (རང་སྒྲིག་གི་ཚོས་གཞི།)
+replace-color.selectText.4=ཡོངས་རྫོགས་ལྡོག་སྒྱུར། (ཚོས་གཞི་ཚང་མ་ལྡོག་སྒྱུར།)
+replace-color.selectText.5=འོད་ཁྱད་མཐོ་བའི་ཚོས་གཞིའི་གདམ་ག
+replace-color.selectText.6=རྒྱབ་ལྗོངས་ནག་པོའི་སྟེང་གི་ཡི་གེ་དཀར་པོ།
+replace-color.selectText.7=རྒྱབ་ལྗོངས་དཀར་པོའི་སྟེང་གི་ཡི་གེ་ནག་པོ།
+replace-color.selectText.8=རྒྱབ་ལྗོངས་ནག་པོའི་སྟེང་གི་ཡི་གེ་སེར་པོ།
+replace-color.selectText.9=རྒྱབ་ལྗོངས་ནག་པོའི་སྟེང་གི་ཡི་གེ་ལྗང་ཁུ།
+replace-color.selectText.10=ཡི་གེའི་ཚོས་གཞི་འདེམས་པ།
+replace-color.selectText.11=རྒྱབ་ལྗོངས་ཀྱི་ཚོས་གཞི་འདེམས་པ།
+replace-color.submit=བརྗེ་སྒྱུར།
 
 
 
@@ -789,93 +790,93 @@ replace-color.submit=Replace
 #                         #
 ###########################
 #login
-login.title=Sign in
-login.header=Sign in
-login.signin=Sign in
-login.rememberme=Remember me
-login.invalid=Invalid username or password.
-login.locked=Your account has been locked.
-login.signinTitle=Please sign in
-login.ssoSignIn=Login via Single Sign-on
-login.oAuth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
-login.oAuth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator.
-login.oauth2RequestNotFound=Authorization request not found
-login.oauth2InvalidUserInfoResponse=Invalid User Info Response
-login.oauth2invalidRequest=Invalid Request
-login.oauth2AccessDenied=Access Denied
-login.oauth2InvalidTokenResponse=Invalid Token Response
-login.oauth2InvalidIdToken=Invalid Id Token
-login.relyingPartyRegistrationNotFound=No relying party registration found
-login.userIsDisabled=User is deactivated, login is currently blocked with this username. Please contact the administrator.
-login.alreadyLoggedIn=You are already logged in to
-login.alreadyLoggedIn2=devices. Please log out of the devices and try again.
-login.toManySessions=You have too many active sessions
+login.title=�ང་འཛུལ།
+login.header=ནང་འཛུལ།
+login.signin=ནང་འཛུལ།
+login.rememberme=ང་དྲན་པར་བྱེད།
+login.invalid=སྤྱོད་མིང་ངམ་གསང་ཚིག་ནོར་འདུག
+login.locked=ཁྱེད་ཀྱི་ཐོ་མཛོད་ཟྭ་རྒྱག་བརྒྱབ་ཟིན།
+login.signinTitle=ནང་འཛུལ་གནང་རོགས།
+login.ssoSignIn=གཅིག་གྱུར་ནང་འཛུལ་བརྒྱུད་ནས་ནང་འཛུལ།
+login.oAuth2AutoCreateDisabled=OAUTH2 རང་འགུལ་སྤྱོད་མཁན་གསར་བཟོ་བཀག་སྡོམ་བྱས་ཟིན།
+login.oAuth2AdminBlockedUser=ད་ལྟ་ཐོ་འགོད་མ་བྱས་པའི་སྤྱོད་མཁན་གྱི་ཐོ་འགོད་དང་ནང་འཛུལ་བཀག་སྡོམ་བྱས་ཡོད། དོ་དམ་པར་འབྲེལ་བ་གནང་རོགས།
+login.oauth2RequestNotFound=དབང་སྤྲོད་རེ་ཞུ་རྙེད་མ་བྱུང་།
+login.oauth2InvalidUserInfoResponse=སྤྱོད་མཁན་གྱི་གནས་ཚུལ་ལན་འདེབས་ནོར་འཁྲུལ།
+login.oauth2invalidRequest=རེ་ཞུ་ནོར་འཁྲུལ།
+login.oauth2AccessDenied=འཛུལ་སྤྱོད་བཀག་འགོག
+login.oauth2InvalidTokenResponse=བརྡ་རྟགས་ལན་འདེབས་ནོར་འཁྲུལ།
+login.oauth2InvalidIdToken=ངོ་རྟགས་བརྡ་རྟགས་ནོར་འཁྲུལ།
+login.relyingPartyRegistrationNotFound=བརྟེན་སའི་ཚོགས་པའི་ཐོ་འགོད་རྙེད་མ་བྱུང་།
+login.userIsDisabled=སྤྱོད་མཁན་བཀག་སྡོམ་བྱས་ཟིན། སྤྱོད་མིང་འདི་བརྒྱུད་ནས་ནང་འཛུལ་བྱེད་མི་ཆོག དོ་དམ་པར་འབྲེལ་བ་གནང་རོགས།
+login.alreadyLoggedIn=ཁྱེད་རང་
+login.alreadyLoggedIn2=སྒྲིག་ཆས་ནང་ནང་འཛུལ་བྱས་ཟིན། སྒྲིག་ཆས་ནས་ཕྱིར་འཐེན་བྱས་ནས་ཡང་བསྐྱར་ཚོད་ལྟ་བྱེད་རོགས།
+login.toManySessions=ཁྱེད་ལ་འཛུལ་ཞུགས་བྱས་པའི་གནས་སྐབས་མང་དྲགས་འདུག
 login.logoutMessage=You have been logged out.
 
 #auto-redact
-autoRedact.title=Auto Redact
-autoRedact.header=Auto Redact
-autoRedact.colorLabel=Colour
-autoRedact.textsToRedactLabel=Text to Redact (line-separated)
-autoRedact.textsToRedactPlaceholder=e.g. \nConfidential \nTop-Secret
-autoRedact.useRegexLabel=Use Regex
-autoRedact.wholeWordSearchLabel=Whole Word Search
-autoRedact.customPaddingLabel=Custom Extra Padding
-autoRedact.convertPDFToImageLabel=Convert PDF to PDF-Image (Used to remove text behind the box)
-autoRedact.submitButton=Submit
+autoRedact.title=རང་འགུལ་སྒྲིབ་སྲུང་།
+autoRedact.header=རང་འགུལ་སྒྲིབ་སྲུང་།
+autoRedact.colorLabel=ཚོས་གཞི།
+autoRedact.textsToRedactLabel=སྒྲིབ་རྒྱུའི་ཡི་གེ། (ཐིག་ཕྲེང་སོ་སོར།)
+autoRedact.textsToRedactPlaceholder=དཔེར་ན། \nགསང་བ། \nགསང་ཆེ།
+autoRedact.useRegexLabel=Regex བེད་སྤྱོད།
+autoRedact.wholeWordSearchLabel=ཚིག་ཆ་ཚང་འཚོལ་བ།
+autoRedact.customPaddingLabel=མཐའ་མཚམས་སྟོང་ཆ་སྣོན་པ།
+autoRedact.convertPDFToImageLabel=PDF ནས་ PDF-པར་རིས་ལ་བསྒྱུར་བ། (སྒྲོམ་གྱི་རྒྱབ་ཀྱི་ཡི་གེ་སུབ་པར་བེད་སྤྱོད།)
+autoRedact.submitButton=ཕུལ་བ།
 
 #redact
-redact.title=Manual Redaction
-redact.header=Manual Redaction
-redact.submit=Redact
-redact.textBasedRedaction=Text based Redaction
-redact.pageBasedRedaction=Page-based Redaction
-redact.convertPDFToImageLabel=Convert PDF to PDF-Image (Used to remove text behind the box)
-redact.pageRedactionNumbers.title=Pages
-redact.pageRedactionNumbers.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
-redact.redactionColor.title=Redaction Color
-redact.export=Export
-redact.upload=Upload
-redact.boxRedaction=Box draw redaction
-redact.zoom=Zoom
-redact.zoomIn=Zoom in
-redact.zoomOut=Zoom out
-redact.nextPage=Next Page
-redact.previousPage=Previous Page
-redact.toggleSidebar=Toggle Sidebar
-redact.showThumbnails=Show Thumbnails
-redact.showDocumentOutline=Show Document Outline (double-click to expand/collapse all items)
-redact.showAttatchments=Show Attachments
-redact.showLayers=Show Layers (double-click to reset all layers to the default state)
-redact.colourPicker=Colour Picker
-redact.findCurrentOutlineItem=Find current outline item
+redact.title=ལག་བཟོས་སྒྲིབ་སྲུང་།
+redact.header=ལག་བཟོས་སྒྲིབ་སྲུང་།
+redact.submit=སྒྲིབ་སྲུང་།
+redact.textBasedRedaction=ཡི་གེ་གཞིར་བཟུང་བའི་སྒྲིབ་སྲུང་།
+redact.pageBasedRedaction=ཤོག་ངོས་གཞིར་བཟུང་བའི་སྒྲིབ་སྲུང་།
+redact.convertPDFToImageLabel=PDF ནས་ PDF-པར་རིས་ལ་བསྒྱུར་བ། (སྒྲོམ་གྱི་རྒྱབ་ཀྱི་ཡི་གེ་སུབ་པར་བེད་སྤྱོད།)
+redact.pageRedactionNumbers.title=ཤོག་ངོས།
+redact.pageRedactionNumbers.placeholder=(དཔེར་ན། 1,2,8 ཡང་ན་ 4,7,12-16 ཡང་ན་ 2n-1)
+redact.redactionColor.title=སྒྲིབ་སྲུང་གི་ཚོས་གཞི།
+redact.export=ཕྱིར་འདྲེན།
+redact.upload=ཡར་འཇུག
+redact.boxRedaction=སྒྲོམ་བྲིས་སྒྲིབ་སྲུང་།
+redact.zoom=ཆེ་ཆུང་།
+redact.zoomIn=ཆེ་རུ་གཏོང་བ།
+redact.zoomOut=ཆུང་དུ་གཏོང་བ།
+redact.nextPage=ཤོག་ངོས་རྗེས་མ།
+redact.previousPage=ཤོག་ངོས་སྔོན་མ།
+redact.toggleSidebar=ཟུར་སྣེའི་སྡེ་ཚན་སྟོན་སྦས།
+redact.showThumbnails=བསྡུས་པར་སྟོན།
+redact.showDocumentOutline=ཡིག་ཆའི་སྒྲོམ་གཞི་སྟོན། (ནང་གསེས་ཚང་མ་རྒྱ་སྐྱེད་/བསྡུ་བར་ཉིས་རྡེབ།)
+redact.showAttatchments=ཟུར་སྦྱར་སྟོན།
+redact.showLayers=རིམ་པ་སྟོན། (རིམ་པ་ཚང་མ་སྔོན་སྒྲིག་གནས་བབ་ལ་བསྐྱར་སྒྲིག་བྱེད་པར་ཉིས་རྡེབ།)
+redact.colourPicker=ཚོས་གཞི་འདེམས་བྱེད���
+redact.findCurrentOutlineItem=ད་ལྟའི་སྒྲོམ་གཞིའི་ནང་དོན་འཚོལ་བ།
 redact.applyChanges=Apply Changes
 
 #showJS
-showJS.title=Show Javascript
-showJS.header=Show Javascript
-showJS.downloadJS=Download Javascript
-showJS.submit=Show
+showJS.title=Javascript ས�ོན་པ།
+showJS.header=Javascript སྟོན་པ།
+showJS.downloadJS=Javascript ཕབ་ལེན།
+showJS.submit=སྟོན་པ།
 
 
 #pdfToSinglePage
-pdfToSinglePage.title=PDF To Single Page
-pdfToSinglePage.header=PDF To Single Page
-pdfToSinglePage.submit=Convert To Single Page
+pdfToSinglePage.title=PDF ནས་ཤོག་ངོས་གཅིག་ལ།
+pdfToSinglePage.header=PDF ནས་ཤོག་ངོས་གཅིག་ལ།
+pdfToSinglePage.submit=ཤོག་ངོས་གཅིག་ལ་བསྒྱུར་བ།
 
 
 #pageExtracter
-pageExtracter.title=Extract Pages
-pageExtracter.header=Extract Pages
-pageExtracter.submit=Extract
-pageExtracter.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pageExtracter.title=ཤོག་ངོས་ཕྱིར་འདོན།
+pageExtracter.header=ཤོག་ངོས་ཕྱིར་འདོན།
+pageExtracter.submit=ཕྱིར་འདོན།
+pageExtracter.placeholder=(དཔེར་ན། 1,2,8 ཡང་ན་ 4,7,12-16 ཡང་ན་ 2n-1)
 
 
 #getPdfInfo
-getPdfInfo.title=Get Info on PDF
-getPdfInfo.header=Get Info on PDF
-getPdfInfo.submit=Get Info
-getPdfInfo.downloadJson=Download JSON
+getPdfInfo.title=PDF ཡི་གནས་ཚུལ་ལེན་པ།
+getPdfInfo.header=PDF ཡི་གནས་ཚུལ་ལེན་པ།
+getPdfInfo.submit=གནས་ཚུལ་ལེན་པ།
+getPdfInfo.downloadJson=JSON ཕབ་ལེན།
 getPdfInfo.summary=PDF Summary
 getPdfInfo.summary.encrypted=This PDF is encrypted so may face issues with some applications
 getPdfInfo.summary.permissions=This PDF has {0} restricted permissions which may limit what you can do with it
@@ -901,11 +902,11 @@ getPdfInfo.section.PerPageInfo=Detailed information about each page in the docum
 
 
 #markdown-to-pdf
-MarkdownToPDF.title=Markdown To PDF
-MarkdownToPDF.header=Markdown To PDF
-MarkdownToPDF.submit=Convert
-MarkdownToPDF.help=Work in progress
-MarkdownToPDF.credit=Uses WeasyPrint
+MarkdownToPDF.title=Markdown ནས་ PDF ལ།
+MarkdownToPDF.header=Markdown ནས་ PDF ལ།
+MarkdownToPDF.submit=བསྒྱུར་བ།
+MarkdownToPDF.help=ལས་ཀ་བྱེད་བཞིན་པ།
+MarkdownToPDF.credit=WeasyPrint བེད་སྤྱོད་བྱེད་པ།
 
 
 #pdf-to-markdown
@@ -915,510 +916,510 @@ PDFToMarkdown.submit=Convert
 
 
 #url-to-pdf
-URLToPDF.title=URL To PDF
-URLToPDF.header=URL To PDF
-URLToPDF.submit=Convert
-URLToPDF.credit=Uses WeasyPrint
+URLToPDF.title=URL ནས་ PDF ལ།
+URLToPDF.header=URL ནས་ PDF ལ།
+URLToPDF.submit=བསྒྱུར་བ།
+URLToPDF.credit=WeasyPrint བེད་སྤྱོད་བྱེད་པ།
 
 
 #html-to-pdf
-HTMLToPDF.title=HTML To PDF
-HTMLToPDF.header=HTML To PDF
-HTMLToPDF.help=Accepts HTML files and ZIPs containing html/css/images etc required
-HTMLToPDF.submit=Convert
-HTMLToPDF.credit=Uses WeasyPrint
-HTMLToPDF.zoom=Zoom level for displaying the website.
-HTMLToPDF.pageWidth=Width of the page in centimeters. (Blank to default)
-HTMLToPDF.pageHeight=Height of the page in centimeters. (Blank to default)
-HTMLToPDF.marginTop=Top margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginBottom=Bottom margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginLeft=Left margin of the page in millimeters. (Blank to default)
-HTMLToPDF.marginRight=Right margin of the page in millimeters. (Blank to default)
-HTMLToPDF.printBackground=Render the background of websites.
-HTMLToPDF.defaultHeader=Enable Default Header (Name and page number)
-HTMLToPDF.cssMediaType=Change the CSS media type of the page.
-HTMLToPDF.none=None
-HTMLToPDF.print=Print
-HTMLToPDF.screen=Screen
+HTMLToPDF.title=HTML ནས་ PDF ལ།
+HTMLToPDF.header=HTML ནས་ PDF ལ།
+HTMLToPDF.help=HTML ཡིག་ཆ་དང་དགོས་མཁོའི་ html/css/པར་རིས་སོགས་འདུས་པའི་ ZIP ཡིག་ཆ་ངོས་ལེན་བྱེད་པ།
+HTMLToPDF.submit=བསྒྱུར་བ།
+HTMLToPDF.credit=WeasyPrint བེད་སྤྱོད་བྱེད་པ།
+HTMLToPDF.zoom=དྲ་ཚིགས་སྟོན་པའི་ཆེ་ཆུང་ཚད།
+HTMLToPDF.pageWidth=ཤོག་ངོས་ཀྱི་ཞེང་ཚད་སེན་ཊི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.pageHeight=ཤོག་ངོས་ཀྱི་དཔངས་ཚད་སེན་ཊི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.marginTop=ཤོག་ངོས་ཀྱི་སྟེང་མཐའི་བར་ཐག་མི་ལི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.marginBottom=ཤོག་ངོས་ཀྱི་འོག་མཐའི་བར་ཐག་མི་ལི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.marginLeft=ཤོག་ངོས་ཀྱི་གཡོན་མཐའི་བར་ཐག་མི་ལི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.marginRight=ཤོག་ངོས་ཀྱི་གཡས་མཐའི་བར་ཐག་མི་ལི་མི་ཊར་ནང་། (སྟོང་པར་བཞག་ན་སྔོན་སྒྲིག)
+HTMLToPDF.printBackground=དྲ་ཚིགས་ཀྱི་རྒྱབ་ལྗོངས་མངོན་པ།
+HTMLToPDF.defaultHeader=སྔོན་སྒྲིག་མགོ་བྱང་སྤྱོད་པ། (མིང་དང་ཤོག་གྲངས།)
+HTMLToPDF.cssMediaType=ཤོག་ངོས་ཀྱི་ CSS བརྒྱུད་ལམ་རིགས་བསྒྱུར་བ།
+HTMLToPDF.none=མེད།
+HTMLToPDF.print=པར་འདེབས།
+HTMLToPDF.screen=བརྙན་ཡོལ།
 
 
 #AddStampRequest
-AddStampRequest.header=Stamp PDF
-AddStampRequest.title=Stamp PDF
-AddStampRequest.stampType=Stamp Type
-AddStampRequest.stampText=Stamp Text
-AddStampRequest.stampImage=Stamp Image
-AddStampRequest.alphabet=Alphabet
-AddStampRequest.fontSize=Font/Image Size
-AddStampRequest.rotation=Rotation
-AddStampRequest.opacity=Opacity
-AddStampRequest.position=Position
-AddStampRequest.overrideX=Override X Coordinate
-AddStampRequest.overrideY=Override Y Coordinate
-AddStampRequest.customMargin=Custom Margin
-AddStampRequest.customColor=Custom Text Colour
-AddStampRequest.submit=Submit
+AddStampRequest.header=PDF ལ་ཐེལ་ཙེ་རྒྱག་པ།
+AddStampRequest.title=PDF ལ་ཐེལ་ཙེ་རྒྱག་པ།
+AddStampRequest.stampType=ཐེལ་ཙེའི་རིགས།
+AddStampRequest.stampText=ཐེལ་ཙེའི་ཡི་གེ
+AddStampRequest.stampImage=ཐེལ་ཙེའི་པར་རིས།
+AddStampRequest.alphabet=ཡི་གེའི་གཟུགས།
+AddStampRequest.fontSize=ཡི་གེ/པར་རིས་ཀྱི་ཆེ་ཆུང་།
+AddStampRequest.rotation=འཁོར་སྐྱོད།
+AddStampRequest.opacity=གསལ་ཚད།
+AddStampRequest.position=གནས་ས།
+AddStampRequest.overrideX=X གནས་ཚད་བརྗེ་བསྒྱུར།
+AddStampRequest.overrideY=Y གནས་ཚད་བརྗེ་བསྒྱུར།
+AddStampRequest.customMargin=མཐའ་མཚམས་རང་སྒྲིག
+AddStampRequest.customColor=ཡི་གེའི་ཚོས་མདོག་རང་སྒྲིག
+AddStampRequest.submit=ཕུལ་བ།
 
 
 #sanitizePDF
-sanitizePDF.title=Sanitize PDF
-sanitizePDF.header=Sanitize a PDF file
-sanitizePDF.selectText.1=Remove JavaScript actions
-sanitizePDF.selectText.2=Remove embedded files
+sanitizePDF.title=PDF གཙང་སེལ།
+sanitizePDF.header=PDF ཡིག་ཆ་གཙང་སེལ།
+sanitizePDF.selectText.1=Javascript བྱ་འགུལ་སུབ་པ།
+sanitizePDF.selectText.2=ནང་འཇུག་ཡིག་ཆ་སུབ་པ།
 sanitizePDF.selectText.3=Remove XMP metadata
-sanitizePDF.selectText.4=Remove links
-sanitizePDF.selectText.5=Remove fonts
+sanitizePDF.selectText.4=འབྲེལ་ཐག་སུབ་པ།
+sanitizePDF.selectText.5=ཡིག་གཟུགས་སུབ་པ།
 sanitizePDF.selectText.6=Remove Document Info Metadata
-sanitizePDF.submit=Sanitize PDF
+sanitizePDF.submit=PDF གཙང་སེལ།
 
 
 #addPageNumbers
-addPageNumbers.title=Add Page Numbers
-addPageNumbers.header=Add Page Numbers
-addPageNumbers.selectText.1=Select PDF file:
-addPageNumbers.selectText.2=Margin Size
-addPageNumbers.selectText.3=Position
-addPageNumbers.selectText.4=Starting Number
-addPageNumbers.selectText.5=Pages to Number
-addPageNumbers.selectText.6=Custom Text
-addPageNumbers.customTextDesc=Custom Text
-addPageNumbers.numberPagesDesc=Which pages to number, default 'all', also accepts 1-5 or 2,5,9 etc
-addPageNumbers.customNumberDesc=Defaults to {n}, also accepts 'Page {n} of {total}', 'Text-{n}', '{filename}-{n}
-addPageNumbers.submit=Add Page Numbers
+addPageNumbers.title=ཤོག་གྲངས་སྣོན་པ།
+addPageNumbers.header=ཤོག་གྲངས་སྣོན་པ།
+addPageNumbers.selectText.1=PDF ཡིག་ཆ་འདེམས་པ།
+addPageNumbers.selectText.2=མཐའ་མཚམས་ཀྱི་ཆེ་ཆུང་།
+addPageNumbers.selectText.3=གནས་ས།
+addPageNumbers.selectText.4=འགོ་འཛུགས་ཨང་གྲངས།
+addPageNumbers.selectText.5=ཨང་གྲངས་རྒྱག་རྒྱུའི་ཤོག་ངོས།
+addPageNumbers.selectText.6=རང་སྒྲིག་ཡི་གེ
+addPageNumbers.customTextDesc=རང་སྒྲིག་ཡི་གེ
+addPageNumbers.numberPagesDesc=ཨང་གྲངས་རྒྱག་རྒྱུའི་ཤོག་ངོས། སྔོན་སྒྲིག་ནི་'ཚང་མ་'ཡིན། 1-5 ཡང་ན་ 2,5,9 སོགས་ཀྱང་ངོས་ལེན་བྱེད།
+addPageNumbers.customNumberDesc=སྔོན་སྒྲིག་ནི་ {n} ཡིན། 'ཤོག་ངོས་ {n} / {total}', 'ཡི་གེ-{n}', '{filename}-{n}' སོགས་ཀྱང་ངོས་ལེན་བྱེད།
+addPageNumbers.submit=ཤོག་གྲངས་སྣོན་པ།
 
 
 #auto-rename
-auto-rename.title=Auto Rename
-auto-rename.header=Auto Rename PDF
-auto-rename.submit=Auto Rename
+auto-rename.title=རང་འགུལ་མིང་བསྐྱར་འདོགས།
+auto-rename.header=PDF རང་འགུལ་མིང་བསྐྱར་འདོགས།
+auto-rename.submit=རང་འགུལ་མིང་བསྐྱར་འདོགས།
 
 
 #adjustContrast
-adjustContrast.title=Adjust Contrast
-adjustContrast.header=Adjust Contrast
-adjustContrast.contrast=Contrast:
-adjustContrast.brightness=Brightness:
-adjustContrast.saturation=Saturation:
-adjustContrast.download=Download
+adjustContrast.title=འོད་ཁྱད་སྙོམ་སྒྲིག
+adjustContrast.header=འོད་ཁྱད་སྙོམ་སྒྲིག
+adjustContrast.contrast=འོད་ཁྱད།
+adjustContrast.brightness=གསལ་ཚད།
+adjustContrast.saturation=མདོག་ཚད།
+adjustContrast.download=ཕབ་ལེན།
 
 
 #crop
-crop.title=Crop
-crop.header=Crop PDF
-crop.submit=Submit
+crop.title=གཏུབ་གཅོད།
+crop.header=PDF གཏུབ་གཅོད།
+crop.submit=ཕུལ་བ།
 
 
 #autoSplitPDF
-autoSplitPDF.title=Auto Split PDF
-autoSplitPDF.header=Auto Split PDF
-autoSplitPDF.description=Print, Insert, Scan, upload, and let us auto-separate your documents. No manual work sorting needed.
-autoSplitPDF.selectText.1=Print out some divider sheets from below (Black and white is fine).
-autoSplitPDF.selectText.2=Scan all your documents at once by inserting the divider sheet between them.
-autoSplitPDF.selectText.3=Upload the single large scanned PDF file and let Stirling PDF handle the rest.
-autoSplitPDF.selectText.4=Divider pages are automatically detected and removed, guaranteeing a neat final document.
-autoSplitPDF.formPrompt=Submit PDF containing Stirling-PDF Page dividers:
-autoSplitPDF.duplexMode=Duplex Mode (Front and back scanning)
-autoSplitPDF.dividerDownload2=Download 'Auto Splitter Divider (with instructions).pdf'
-autoSplitPDF.submit=Submit
+autoSplitPDF.title=PDF རང་འགུལ་ཁ་གྱེས།
+autoSplitPDF.header=PDF རང་འགུལ་ཁ་གྱེས།
+autoSplitPDF.description=པར་འདེབས། ནང་འཇུག བཤེར་འབེབས། ཡར་འཇོག་བྱས་ནས་ང་ཚོས་ཡིག་ཆ་རྣམས་རང་འགུལ་གྱིས་ཁ་གྱེས་བྱེད་དུ་འཇུག ལག་བཟོས་གོ་རིམ་སྒྲིག་དགོས་མེད།
+autoSplitPDF.selectText.1=གཤམ་ནས་བར་མཚམས་ཤོག་བུ་འགའ་པར་འདེབས་བྱེད། (ནག་དཀར་ཡིན་ནའང་འགྲིག)
+autoSplitPDF.selectText.2=ཡིག་ཆ་ཚང་མའི་བར་དུ་བར་མཚམས་ཤོག་བུ་བཅུག་ནས་ཐེངས་གཅིག་ལ་བཤེར་འབེབས་བྱེད།
+autoSplitPDF.selectText.3=བཤེར་འབེབས་བྱས་པའི་ PDF ཡིག་ཆ་ཆེན་པོ་གཅིག་ཡར་འཇོག་བྱས་ནས་ Stirling PDF ལ་ལྷག་མ་བྱེད་དུ་འཇུག
+autoSplitPDF.selectText.4=བར་མཚམས་ཤོག་ངོས་རྣམས་རང་འགུལ་གྱིས་ངོས་འཛིན་དང་སུབ་པ་བྱས་ནས་མཐའ་མའི་ཡིག་ཆ་གཙང་མ་ཞིག་ངེས་པར་དུ་ཐོབ་ཐུབ།
+autoSplitPDF.formPrompt=Stirling-PDF ཤོག་ངོས་བར་མཚམས་ཡོད་པའི་ PDF ཕུལ་བ།
+autoSplitPDF.duplexMode=ཕྱོགས་གཉིས་ཀྱི་རྣམ་པ། (མདུན་རྒྱབ་བཤེར་འབེབས།)
+autoSplitPDF.dividerDownload2='རང་འགུལ་ཁ་གྱེས་བར་མཚམས། (བཀོལ་སྤྱོད་ལམ་སྟོན་དང་བཅས་པ།).pdf' ཕབ་ལེན།
+autoSplitPDF.submit=ཕུལ་བ།
 
 
 #pipeline
-pipeline.title=Pipeline
+pipeline.title=རྒ��ུ་ལམ།
 
 
 #pageLayout
-pageLayout.title=Multi Page Layout
-pageLayout.header=Multi Page Layout
-pageLayout.pagesPerSheet=Pages per sheet:
-pageLayout.addBorder=Add Borders
-pageLayout.submit=Submit
+pageLayout.title=ཤོག་ངོས་མང་པོའི་བཀོད་པ།
+pageLayout.header=ཤོག་ངོས་མང་པོའི་བཀོད་པ།
+pageLayout.pagesPerSheet=ཤོག་ལྷེ་རེར་ཤོག་ངོས་གྲངས།
+pageLayout.addBorder=མཐའ་མཚམས་སྣོན་པ།
+pageLayout.submit=ཕུལ་བ།
 
 
 #scalePages
-scalePages.title=Adjust page-scale
-scalePages.header=Adjust page-scale
-scalePages.pageSize=Size of a page of the document.
-scalePages.keepPageSize=Original Size
-scalePages.scaleFactor=Zoom level (crop) of a page.
-scalePages.submit=Submit
+scalePages.title=ཤོག་ངོས་ཆེ་ཆུང་སྙོམ་སྒྲིག
+scalePages.header=ཤོག་ངོས་ཆེ་ཆུང་སྙོམ་སྒྲིག
+scalePages.pageSize=ཡིག་ཆའི་ཤོག་ངོས་ཀྱི་ཆེ་ཆུང་།
+scalePages.keepPageSize=ཐོག་མའི་ཆེ་ཆུང་།
+scalePages.scaleFactor=ཤོག་ངོས་ཀྱི་ཆེ་ཆུང་ཚད། (གཏུབ་གཅོད།)
+scalePages.submit=ཕུལ་བ།
 
 
 #certSign
-certSign.title=Certificate Signing
-certSign.header=Sign a PDF with your certificate (Work in progress)
-certSign.selectPDF=Select a PDF File for Signing:
-certSign.jksNote=Note: If your certificate type is not listed below, please convert it to a Java Keystore (.jks) file using the keytool command line tool. Then, choose the .jks file option below.
-certSign.selectKey=Select Your Private Key File (PKCS#8 format, could be .pem or .der):
-certSign.selectCert=Select Your Certificate File (X.509 format, could be .pem or .der):
-certSign.selectP12=Select Your PKCS#12 Keystore File (.p12 or .pfx) (Optional, If provided, it should contain your private key and certificate):
-certSign.selectJKS=Select Your Java Keystore File (.jks or .keystore):
-certSign.certType=Certificate Type
-certSign.password=Enter Your Keystore or Private Key Password (If Any):
-certSign.showSig=Show Signature
-certSign.reason=Reason
-certSign.location=Location
-certSign.name=Name
-certSign.showLogo=Show Logo
-certSign.submit=Sign PDF
+certSign.title=ལག་ཁྱེར་མིང་རྟགས།
+certSign.header=ཁྱེད་ཀྱི་ལག་ཁྱེར་གྱིས་ PDF ལ་མིང་རྟགས་རྒྱག་པ། (ལས་ཀ་བྱེད་བཞིན་པ།)
+certSign.selectPDF=མིང་རྟགས་རྒྱག་རྒྱུའི་ PDF ཡིག་ཆ་འདེམས་པ།
+certSign.jksNote=དྲན་གསོ། གལ་སྲིད་ཁྱེད་ཀྱི་ལག་ཁྱེར་གྱི་རིགས་གཤམ་དུ་མེད་ན། keytool བཀའ་བརྡ་ཐིག་བེད་སྤྱོད་བྱས་ནས་ Java Keystore (.jks) ཡིག་ཆ་ལ་བསྒྱུར་རོགས། དེ་ནས་གཤམ་དུ་ .jks ཡིག་ཆ་འདེམས་རོགས།
+certSign.selectKey=སྒེར་གྱི་ལྡེ་མིག་ཡིག་ཆ་འདེམས་པ། (PKCS#8 རྣམ་གཞག .pem ཡང་ན་ .der ཡིན་སྲིད།)
+certSign.selectCert=ལག་ཁྱེར་ཡིག་ཆ་འདེམས་པ། (X.509 རྣམ་གཞག .pem ཡང་ན་ .der ཡིན་སྲིད།)
+certSign.selectP12=PKCS#12 ལྡེ་མིག་མཛོད་ཡིག་ཆ་འདེམས་པ། (.p12 ཡང་ན་ .pfx) (འདེམས་རུང་། གལ་སྲིད་མཁོ་སྤྲོད་བྱས་ན། དེའི་ནང་དུ་ཁྱེད་ཀྱི་སྒེར་གྱི་ལྡེ་མིག་དང་ལག་ཁྱེར་འདུས་ཡོད་དགོས།)
+certSign.selectJKS=Java ལྡེ་མིག་མཛོད་ཡིག་ཆ་འདེམས་པ། (.jks ཡང་ན་ .keystore)
+certSign.certType=ལག་ཁྱེར་གྱི་རིགས།
+certSign.password=ཁྱེད་ཀྱི་ལྡེ་མིག་མཛོད་དམ་སྒེར་གྱི་ལྡེ་མིག་གི་གསང་ཚིག་འཇུག་པ། (གལ་སྲིད་ཡོད་ན།)
+certSign.showSig=མིང་རྟགས་སྟོན།
+certSign.reason=རྒྱུ་མཚན།
+certSign.location=ས་གནས།
+certSign.name=མིང་།
+certSign.showLogo=མཚོན་རྟགས་སྟོན།
+certSign.submit=PDF ལ་མིང་རྟགས་རྒྱག་པ།
 
 
 #removeCertSign
-removeCertSign.title=Remove Certificate Signature
-removeCertSign.header=Remove the digital certificate from the PDF
-removeCertSign.selectPDF=Select a PDF file:
-removeCertSign.submit=Remove Signature
+removeCertSign.title=ལག་ཁྱེར་མིང་རྟགས་སུབ་པ།
+removeCertSign.header=PDF ནས་ཨང་ཀིའི་ལག་ཁྱེར་སུབ་པ།
+removeCertSign.selectPDF=PDF ཡིག་ཆ་འདེམས་པ།
+removeCertSign.submit=མིང་རྟགས་སུབ་པ།
 
 
 #removeBlanks
-removeBlanks.title=Remove Blanks
-removeBlanks.header=Remove Blank Pages
-removeBlanks.threshold=Pixel Whiteness Threshold:
-removeBlanks.thresholdDesc=Threshold for determining how white a white pixel must be to be classed as 'White'. 0 = Black, 255 pure white.
-removeBlanks.whitePercent=White Percent (%):
-removeBlanks.whitePercentDesc=Percent of page that must be 'white' pixels to be removed
-removeBlanks.submit=Remove Blanks
+removeBlanks.title=སྟོང་ཤོག་སུབ་པ།
+removeBlanks.header=སྟོང་པའི་ཤོག་ངོས་སུབ་པ།
+removeBlanks.threshold=པིག་ཟེལ་དཀར་པོའི་མཚམས་ཚད།
+removeBlanks.thresholdDesc=པིག་ཟེལ་དཀར་པོ་ཞིག་'དཀར་པོ་'རུ་རྩི་བའི་དཀར་ཚད་ཀྱི་མཚམས། 0 = ནག་པོ། 255 དཀར་པོ་གཙང་མ།
+removeBlanks.whitePercent=དཀར་པོའི་བརྒྱ་ཆ། (%)
+removeBlanks.whitePercentDesc=སུབ་རྒྱུའི་ཤོག་ངོས་ཤིག་གི་'དཀར་པོའི་'པིག་ཟེལ་གྱི་བརྒྱ་ཆ།
+removeBlanks.submit=སྟོང་ཤོག་སུབ་པ།
 
 
 #removeAnnotations
-removeAnnotations.title=Remove Annotations
-removeAnnotations.header=Remove Annotations
-removeAnnotations.submit=Remove
+removeAnnotations.title=མཆན་འགྲེལ་སུབ་པ།
+removeAnnotations.header=མཆན་འགྲེལ་སུབ་པ།
+removeAnnotations.submit=སུབ་པ།
 
 
 #compare
-compare.title=Compare
-compare.header=Compare PDFs
-compare.highlightColor.1=Highlight Colour 1:
-compare.highlightColor.2=Highlight Colour 2:
-compare.document.1=Document 1
-compare.document.2=Document 2
-compare.submit=Compare
-compare.complex.message=One or both of the provided documents are large files, accuracy of comparison may be reduced
-compare.large.file.message=One or Both of the provided documents are too large to process
-compare.no.text.message=One or both of the selected PDFs have no text content. Please choose PDFs with text for comparison.
+compare.title=བས�ུར་བ།
+compare.header=PDF བསྡུར་བ།
+compare.highlightColor.1=མདངས་འདོན་ཚོས་གཞི་ ༡།
+compare.highlightColor.2=མདངས་འདོན་ཚོས་གཞི་ ༢།
+compare.document.1=ཡིག་ཆ་ ༡
+compare.document.2=ཡིག་ཆ་ ༢
+compare.submit=བསྡུར་བ།
+compare.complex.message=མཁོ་སྤྲོད་བྱས་པའི་ཡིག་ཆ་གཅིག་གམ་གཉིས་ཀ་ཡིག་ཆ་ཆེན་པོ་ཡིན་པས། བསྡུར་བའི་ཏག་ཏག་ཚད་ཉུང་དུ་འགྲོ་སྲིད།
+compare.large.file.message=མཁོ་སྤྲོད་བྱས་པའི་ཡིག་ཆ་གཅིག་གམ་གཉིས་ཀ་བཀོལ་སྤྱོད་བྱེད་མི་ཐུབ་པའི་ཆེ་ཚད་ཡིན།
+compare.no.text.message=འདེམས་པའི་ PDF གཅིག་གམ་གཉིས་ཀར་ཡི་གེའི་ནང་དོན་མི་འདུག བསྡུར་བའི་ཆེད་དུ་ཡི་གེ་ཡོད་པའི་ PDF འདེམས་རོགས།
 
 #sign
-sign.title=Sign
-sign.header=Sign PDFs
-sign.upload=Upload Image
-sign.draw=Draw Signature
-sign.text=Text Input
-sign.clear=Clear
-sign.add=Add
-sign.saved=Saved Signatures
-sign.save=Save Signature
-sign.personalSigs=Personal Signatures
-sign.sharedSigs=Shared Signatures
-sign.noSavedSigs=No saved signatures found
-sign.addToAll=Add to all pages
-sign.delete=Delete
-sign.first=First page
-sign.last=Last page
-sign.next=Next page
-sign.previous=Previous page
-sign.maintainRatio=Toggle maintain aspect ratio
+sign.title=མིང་རྟགས།
+sign.header=PDF ལ་མིང་རྟགས་རྒྱག་པ།
+sign.upload=པར་རིས་ཡར་འཇོག
+sign.draw=མིང་རྟགས་འབྲི་བ།
+sign.text=ཡི་གེ་འཇུག་པ།
+sign.clear=གཙང་སེལ།
+sign.add=སྣོན་པ།
+sign.saved=ཉར་ཚགས་བྱས་པའི་མིང་རྟགས།
+sign.save=མིང་རྟགས་ཉར་ཚགས།
+sign.personalSigs=སྒེར་གྱི་མིང་རྟགས།
+sign.sharedSigs=མཉམ་སྤྱོད་མིང་རྟགས།
+sign.noSavedSigs=ཉར་ཚགས་བྱས་པའི་མིང་རྟགས་མ་རྙེད།
+sign.addToAll=ཤོག་ངོས་ཚང་མར་སྣོན་པ།
+sign.delete=སུབ་པ།
+sign.first=ཤོག་ངོས་དང་པོ།
+sign.last=ཤོག་ངོས་མཐའ་མ།
+sign.next=ཤོག་ངོས་རྗེས་མ།
+sign.previous=ཤོག་ངོས་སྔོན་མ།
+sign.maintainRatio=བསྡུར་ཚད་རྒྱུན་འཁྱོངས་སྒོ་རྒྱག་པ།
 sign.undo=Undo
 sign.redo=Redo
 
 #repair
-repair.title=Repair
-repair.header=Repair PDFs
-repair.submit=Repair
+repair.title=བཟོ་བཅོས།
+repair.header=PDF བཟོ་བཅོས།
+repair.submit=བཟོ་བཅོས།
 
 
 #flatten
-flatten.title=Flatten
-flatten.header=Flatten PDF
-flatten.flattenOnlyForms=Flatten only forms
-flatten.submit=Flatten
+flatten.title=སྙ�མས་པ།
+flatten.header=PDF སྙོམས་པ།
+flatten.flattenOnlyForms=འགེངས་ཤོག་ཁོ་ན་སྙོམས་པ།
+flatten.submit=སྙོམས་པ།
 
 
 #ScannerImageSplit
-ScannerImageSplit.selectText.1=Angle Threshold:
-ScannerImageSplit.selectText.2=Sets the minimum absolute angle required for the image to be rotated (default: 10).
-ScannerImageSplit.selectText.3=Tolerance:
-ScannerImageSplit.selectText.4=Determines the range of colour variation around the estimated background colour (default: 30).
-ScannerImageSplit.selectText.5=Minimum Area:
-ScannerImageSplit.selectText.6=Sets the minimum area threshold for a photo (default: 10000).
-ScannerImageSplit.selectText.7=Minimum Contour Area:
-ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a photo
-ScannerImageSplit.selectText.9=Border Size:
-ScannerImageSplit.selectText.10=Sets the size of the border added and removed to prevent white borders in the output (default: 1).
-ScannerImageSplit.info=Python is not installed. It is required to run.
+ScannerImageSplit.selectText.1=�ུར་ཚད་མཚམས།
+ScannerImageSplit.selectText.2=པར་རིས་འཁོར་སྐྱོད་བྱེད་དགོས་པའི་ཉུང་མཐའི་ཟུར་ཚད་སྒྲིག་འགོད་བྱེད་པ། (སྔོན་སྒྲིག 10)
+ScannerImageSplit.selectText.3=བཟོད་སྲན་ཚད།
+ScannerImageSplit.selectText.4=ཚོད་དཔག་བྱས་པའི་རྒྱབ་ལྗོངས་ཚོས་གཞིའི་མཐའ་འཁོར་གྱི་ཚོས་མདོག་འགྱུར་བའི་ཁྱབ་ཚད་ཐག་གཅོད་བྱེད་པ། (སྔོན་སྒྲིག 30)
+ScannerImageSplit.selectText.5=ཉུང་མཐའི་རྒྱ་ཁྱོན།
+ScannerImageSplit.selectText.6=པར་རིས་ཤིག་གི་ཉུང་མཐའི་རྒྱ་ཁྱོན་མཚམས་སྒྲིག་འགོད་བྱེད་པ། (སྔོན་སྒྲིག 10000)
+ScannerImageSplit.selectText.7=ཉུང་མཐའི་མཐའ་འཁོར་རྒྱ་ཁྱོན།
+ScannerImageSplit.selectText.8=པར་རིས་ཤིག་གི་ཉུང་མཐའི་མཐའ་འཁོར་རྒྱ་ཁྱོན་མཚམས་སྒྲིག་འགོད་བྱེད་པ།
+ScannerImageSplit.selectText.9=མཐའ་མཚམས་ཆེ་ཆུང་།
+ScannerImageSplit.selectText.10=ཕྱིར་འདོན་པའི་ནང་དཀར་མཐའ་འགོག་པའི་ཆེད་དུ་སྣོན་པ་དང་སུབ་པ་བྱེད་པ�� (སྔོན་སྒྲིག 1)
+ScannerImageSplit.info=Python སྒྲིག་འཇུག་བྱས་མི་འདུག འདི་བཀོལ་སྤྱོད་བྱེད་པར་དགོས་མཁོ་ཡིན།
 
 
 #OCR
-ocr.title=OCR / Scan Cleanup
-ocr.header=Cleanup Scans / OCR (Optical Character Recognition)
-ocr.selectText.1=Select languages that are to be detected within the PDF (Ones listed are the ones currently detected):
-ocr.selectText.2=Produce text file containing OCR text alongside the OCR'ed PDF
-ocr.selectText.3=Correct pages were scanned at a skewed angle by rotating them back into place
-ocr.selectText.4=Clean page so its less likely that OCR will find text in background noise. (No output change)
-ocr.selectText.5=Clean page so its less likely that OCR will find text in background noise, maintains cleanup in output.
-ocr.selectText.6=Ignores pages that have interactive text on them, only OCRs pages that are images
-ocr.selectText.7=Force OCR, will OCR Every page removing all original text elements
-ocr.selectText.8=Normal (Will error if PDF contains text)
-ocr.selectText.9=Additional Settings
-ocr.selectText.10=OCR Mode
-ocr.selectText.11=Remove images after OCR (Removes ALL images, only useful if part of conversion step)
-ocr.selectText.12=Render Type (Advanced)
-ocr.help=Please read this documentation on how to use this for other languages and/or use not in docker
-ocr.credit=This service uses qpdf and Tesseract for OCR.
-ocr.submit=Process PDF with OCR
+ocr.title=OCR / བ�ེར་འབེབས་གཙང་སེལ།
+ocr.header=བཤེར་འབེབས་གཙང་སེལ། / OCR (འོད་ཀྱི་ཡིག་འབྲུ་ངོས་འཛིན།)
+ocr.selectText.1=PDF ནང་དུ་ངོས་འཛིན་བྱ་རྒྱུའི་སྐད་ཡིག་འདེམས་པ། (བཀོད་པ་རྣམས་ནི་ད་ལྟ་ངོས་འཛིན་བྱས་ཟིན་པ་ཡིན།)
+ocr.selectText.2=OCR བྱས་པའི་ཡི་གེ་དང་མཉམ་དུ་ OCR བྱས་པའི་ PDF ཡི་ཡི་གེའི་ཡིག་ཆ་བཟོ་བ།
+ocr.selectText.3=ཡོ་འཁྱོག་ཏུ་བཤེར་འབེབས་བྱས་པའི་ཤོག་ངོས་རྣམས་ཡང་བསྐྱར་འཁོར་སྐྱོད་བྱས་ནས་གནས་སུ་འཇོག་པ།
+ocr.selectText.4=OCR གྱིས་རྒྱབ་ལྗོངས་ཀྱི་སྒྲ་གདངས་ནང་དུ་ཡི་གེ་རྙེད་མི་སྲིད་པའི་ཆེད་དུ་ཤོག་ངོས་གཙང་སེལ་བྱེད་པ། (ཕྱིར་འདོན་ལ་འགྱུར་བ་མེད།)
+ocr.selectText.5=OCR གྱིས་རྒྱབ་ལྗོངས་ཀྱི་སྒྲ་གདངས་ནང་དུ་ཡི་གེ་རྙེད་མི་སྲིད་པའི་ཆེད་དུ་ཤོག་ངོས་གཙང་སེལ་བྱེད་པ། ཕྱིར་འདོན་ནང་དུ་གཙང་སེལ་རྒྱུན་འཁྱོངས་བྱེད་པ།
+ocr.selectText.6=སྤྱོད་སྒོ་ཡོད་པའི་ཡི་གེ་ཡོད་པའི་ཤོག་ངོས་རྣམས་སྣང་མེད་དུ་འཇོག་པ། པར་རིས་ཡིན་པའི་ཤོག་ངོས་ཁོ་ནར་ OCR བྱེད་པ།
+ocr.selectText.7=OCR བཙན་སྐུལ་བྱེད་པ། ཤོག་ངོས་ཚང་མར་ OCR བྱས་ནས་ཐོག་མའི་ཡི་གེའི་གཞི་རྐྱེན་ཚང་མ་སུབ་པ།
+ocr.selectText.8=རྒྱུན་ལྡན། (PDF ནང་དུ་ཡི་གེ་ཡོད་ན་ནོར་འཁྲུལ་འབྱུང་།)
+ocr.selectText.9=ཟུར་སྣོན་སྒྲིག་འགོད།
+ocr.selectText.10=OCR རྣམ་པ།
+ocr.selectText.11=པར་རིས་ཕྱིར་འདོན།
+ocr.selectText.12=པར་རིས་ཕྱིར་འདོན།
+ocr.help=སྐད་ཡིག་གཞན་དག་གི་ཆེད་དུ་བེད་སྤྱོད་བྱེད་སྟངས་དང་/ཡང་ན་ docker མིན་པའི་བེད་སྤྱོད་ཀྱི་ཆེད་དུ་ཡིག་ཆ་འདི་ཀློག་རོགས།
+ocr.credit=ཞབས་ཞུ་འདིས་ OCR གྱི་ཆེད་དུ་ qpdf དང་ Tesseract བེད་སྤྱོད་བྱེད་པ།
+ocr.submit=OCR བརྒྱུད་ནས་ PDF བཀོལ་སྤྱོད།
 
 
 #extractImages
 extractImages.title=Extract Images
 extractImages.header=Extract Images
-extractImages.selectText=Select image format to convert extracted images to
-extractImages.allowDuplicates=Save duplicate images
-extractImages.submit=Extract
+extractImages.selectText=ཕྱིར་བཏོན་པའི་པར་རིས་རྣམས་བསྒྱུར་རྒྱུའི་པར་རིས་རྣམ་གཞག་འདེམས་པ།
+extractImages.allowDuplicates=བསྐྱར་ཟློས་པར་རིས་ཉར་ཚགས།
+extractImages.submit=ཕྱིར་འདོན།
 
 
 #File to PDF
-fileToPDF.title=File to PDF
-fileToPDF.header=Convert any file to PDF
-fileToPDF.credit=This service uses LibreOffice and Unoconv for file conversion.
-fileToPDF.supportedFileTypesInfo=Supported File types
-fileToPDF.supportedFileTypes=Supported file types should include the below however for a full updated list of supported formats, please refer to the LibreOffice documentation
-fileToPDF.submit=Convert to PDF
+fileToPDF.title=ཡིག་ཆ་ནས་ PDF ལ།
+fileToPDF.header=ཡིག་ཆ་གང་རུང་ PDF ལ་བསྒྱུར་བ།
+fileToPDF.credit=ཞབས་ཞུ་འདིས་ཡིག་ཆ་བསྒྱུར་བའི་ཆེད་དུ་ LibreOffice དང་ Unoconv བེད་སྤྱོད་བྱེད་པ།
+fileToPDF.supportedFileTypesInfo=རྒྱབ་སྐྱོར་བྱེད་པའི་ཡིག་ཆའི་རིགས།
+fileToPDF.supportedFileTypes=རྒྱབ་སྐྱོར་བྱེད་པའི་ཡིག་ཆའི་རིགས་ནང་དུ་གཤམ་གྱི་རྣམས་འདུས་ཡོད་ཀྱང་། རྒྱབ་སྐྱོར་བྱེད་པའི་རྣམ་གཞག་གི་ཆ་ཚང་བའི་ཐོ་གཞུང་གསར་ཤོས་ཀྱི་ཆེད་དུ། LibreOffice ཡི་ཡིག་ཆར་གཟིགས་རོགས།
+fileToPDF.submit=PDF ལ་བསྒྱུར་བ།
 
 
 #compress
-compress.title=Compress
-compress.header=Compress PDF
-compress.credit=This service uses qpdf for PDF Compress/Optimisation.
-compress.grayscale.label=Apply Grayscale for Compression
+compress.title=སྡུད་སྒྲིལ།
+compress.header=PDF སྡུད་སྒྲིལ།
+compress.credit=ཞབས་ཞུ་འདིས་ PDF སྡུད་སྒྲིལ་/ཡར་རྒྱས་གཏོང་བའི་ཆེད་དུ་ qpdf བེད་སྤྱོད་བྱེད་པ།
+compress.grayscale.label=应用灰度进行压缩
 compress.selectText.1=Compression Settings
 compress.selectText.1.1=1-3 PDF compression,</br> 4-6 lite image compression,</br> 7-9 intense image compression Will dramatically reduce image quality
 compress.selectText.2=Optimisation level:
-compress.selectText.4=Auto mode - Auto adjusts quality to get PDF to exact size
-compress.selectText.5=Expected PDF Size (e.g. 25MB, 10.8MB, 25KB)
-compress.submit=Compress
+compress.selectText.4=རང་འགུལ་རྣམ་པ། - PDF ཏག་ཏག་ཆེ་ཆུང་ཚད་ལ་འཁྲིད་པའི་ཆེད་དུ་སྤུས་ཚད་རང་འགུལ་གྱིས་སྙོམ་སྒྲིག་བྱེད་པ།
+compress.selectText.5=རེ་བའི་ PDF ཆེ་ཆུང་། (དཔེར་ན། 25MB, 10.8MB, 25KB)
+compress.submit=སྡུད་སྒྲིལ།
 
 
 #Add image
-addImage.title=Add Image
-addImage.header=Add image to PDF
-addImage.everyPage=Every Page?
-addImage.upload=Add image
-addImage.submit=Add image
+addImage.title=པར་རིས་སྣོན་པ།
+addImage.header=PDF ལ་པར་རིས་སྣོན་པ།
+addImage.everyPage=ཤོག་ངོས་ཚང་མར་ཡིན་ནམ།
+addImage.upload=པར་རིས་སྣོན་པ།
+addImage.submit=པར་རིས་སྣོན་པ།
 
 
 #merge
-merge.title=Merge
+merge.title=སྡེབ་སྦྱོར།
 merge.header=Merge multiple PDFs (2+)
 merge.sortByName=Sort by name
-merge.sortByDate=Sort by date
-merge.removeCertSign=Remove digital signature in the merged file?
+merge.sortByDate=དུས་ཚོད་ལྟར་གོ་རིམ་སྒྲིག་པ།
+merge.removeCertSign=སྡེབ་སྦྱོར་བྱས་པའི་ཡིག་ཆའི་ནང་གི་ཨང་ཀིའི་མིང་རྟགས་སུབ་བམ།
 merge.generateToc=Generate table of contents in the merged file?
-merge.submit=Merge
+merge.submit=སྡེབ་སྦྱོར།
 
 
 #pdfOrganiser
-pdfOrganiser.title=Page Organiser
-pdfOrganiser.header=PDF Page Organiser
-pdfOrganiser.submit=Rearrange Pages
-pdfOrganiser.mode=Mode
-pdfOrganiser.mode.1=Custom Page Order
-pdfOrganiser.mode.2=Reverse Order
-pdfOrganiser.mode.3=Duplex Sort
-pdfOrganiser.mode.4=Booklet Sort
-pdfOrganiser.mode.5=Side Stitch Booklet Sort
-pdfOrganiser.mode.6=Odd-Even Split
+pdfOrganiser.title=ཤོག་ངོས་གོ་སྒྲིག་བྱེད་མཁན།
+pdfOrganiser.header=PDF ཤོག་ངོས་གོ་སྒྲིག་བྱེད་མཁན།
+pdfOrganiser.submit=ཤོག་ངོས་བསྐྱར་སྒྲིག
+pdfOrganiser.mode=རྣམ་པ།
+pdfOrganiser.mode.1=རང་སྒྲིག་ཤོག་ངོས་གོ་རིམ།
+pdfOrganiser.mode.2=ལྡོག་ཕྱོགས་གོ་རིམ།
+pdfOrganiser.mode.3=ཕྱོགས་གཉིས་གོ་རིམ།
+pdfOrganiser.mode.4=དེབ་ཆུང་གོ་རིམ།
+pdfOrganiser.mode.5=ཟུར་འདྲུད་དེབ་ཆུང་གོ་རིམ།
+pdfOrganiser.mode.6=ཡ་ཟུང་དབྱེ་བ།
 pdfOrganiser.mode.7=Remove First
 pdfOrganiser.mode.8=Remove Last
-pdfOrganiser.mode.9=Remove First and Last
-pdfOrganiser.mode.10=Odd-Even Merge
+pdfOrganiser.mode.9=དང་པོ་དང་མཐའ་མ་སུབ་པ།
+pdfOrganiser.mode.10=ཡ་ཟུང་སྡེབ་སྦྱོར།
 pdfOrganiser.mode.11=Duplicate all pages
-pdfOrganiser.placeholder=(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)
+pdfOrganiser.placeholder=(དཔེར་ན། 1,3,2 ཡང་ན་ 4-8,2,10-12 ཡང་ན་ 2n-1)
 
 
 #multiTool
-multiTool.title=PDF Multi Tool
-multiTool.header=PDF Multi Tool
-multiTool.uploadPrompts=File Name
-multiTool.selectAll=Select All
-multiTool.deselectAll=Deselect All
-multiTool.selectPages=Page Select
-multiTool.selectedPages=Selected Pages
-multiTool.page=Page
-multiTool.deleteSelected=Delete Selected
-multiTool.downloadAll=Export
-multiTool.downloadSelected=Export Selected
+multiTool.title=PDF ལག་ཆ་མང་པོ།
+multiTool.header=PDF ལག་ཆ་མང་པོ།
+multiTool.uploadPrompts=ཡིག་ཆའི་མིང་།
+multiTool.selectAll=ཚང་མ་འདེམས་པ།
+multiTool.deselectAll=འདེམས་པ་ཚང་མ་འདོར་བ།
+multiTool.selectPages=ཤོག་ངོས་འདེམས་པ།
+multiTool.selectedPages=འདེམས་པའི་ཤོག་ངོས།
+multiTool.page=ཤོག་ངོས།
+multiTool.deleteSelected=འདེམས་པ་སུབ་པ།
+multiTool.downloadAll=ཕྱིར་འདྲེན།
+multiTool.downloadSelected=འདེམས་པ་ཕྱིར་འདྲེན།
 
-multiTool.insertPageBreak=Insert Page Break
-multiTool.addFile=Add File
-multiTool.rotateLeft=Rotate Left
-multiTool.rotateRight=Rotate Right
-multiTool.split=Split
+multiTool.insertPageBreak=ཤོག་ངོས་བར་མཚམས་འཇུག་པ།
+multiTool.addFile=ཡིག་ཆ་སྣོན་པ།
+multiTool.rotateLeft=གཡོན་དུ་འཁོར་བ།
+multiTool.rotateRight=གཡས་སུ་འཁོར་བ།
+multiTool.split=དབྱེ་བ།
 multiTool.moveLeft=Move Left
 multiTool.moveRight=Move Right
-multiTool.delete=Delete
-multiTool.dragDropMessage=Page(s) Selected
-multiTool.undo=Undo (CTRL + Z)
-multiTool.redo=Redo (CTRL + Y)
+multiTool.delete=སུབ་པ།
+multiTool.dragDropMessage=ཤིག་ཆ་འདྲུད་འཐེན་བྱས་ནས་གོ་རིམ་བསྒྱུར་བཅོས་བྱེད་ཆོག
+multiTool.undo=ཕྱིར་འཐེན།
+multiTool.redo=བསྐྱར་བཟོ།
 
 #decrypt
-decrypt.passwordPrompt=This file is password-protected. Please enter the password:
-decrypt.cancelled=Operation cancelled for PDF: {0}
-decrypt.noPassword=No password provided for encrypted PDF: {0}
-decrypt.invalidPassword=Please try again with the correct password.
-decrypt.invalidPasswordHeader=Incorrect password or unsupported encryption for PDF: {0}
+decrypt.passwordPrompt=ཡིག་ཆ་འདི་གསང་ཚིག་གིས་སྲུང་སྐྱོབ་བྱས་ཡོད། གསང་ཚིག་འཇུག་རོགས།
+decrypt.cancelled=PDF ཡི་བྱ་བ་མཚམས་འཇོག་བྱས་ཟིན། {0}
+decrypt.noPassword=གསང་སྡོམ་གྲོལ་ཟིན། {0}
+decrypt.invalidPassword=གསང་ཚིག་ཏག་ཏག་དང་མཉམ་དུ་ཡང་བསྐྱར་ཚོད་ལྟ་བྱེད་རོགས།
+decrypt.invalidPasswordHeader=གསང་ཚིག་ནོར་བའམ་རྒྱབ་སྐྱོར་མི་བྱེད་པའི་གསང་སྡོམ་ PDF ཡིན་པ། {0}
 decrypt.unexpectedError=There was an error processing the file. Please try again.
 decrypt.serverError=Server error while decrypting: {0}
-decrypt.success=File decrypted successfully.
+decrypt.success=ཡིག་ཆའི་གསང་སྡོམ་གྲོལ་ཟིན།
 
 #multiTool-advert
 multiTool-advert.message=This feature is also available in our <a href="{0}">multi-tool page</a>. Check it out for enhanced page-by-page UI and additional features!
 
 #view pdf
 viewPdf.title=View/Edit PDF
-viewPdf.header=View PDF
+viewPdf.header=PDF ལྟ་བ།
 
 #pageRemover
 pageRemover.title=Page Remover
 pageRemover.header=PDF Page remover
-pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
-pageRemover.submit=Delete Pages
-pageRemover.placeholder=(e.g. 1,2,6 or 1-10,15-30)
+pageRemover.pagesToDelete=སུབ་རྒྱུའི་ཤོག་ངོས། (ཤོག་གྲངས་ཀྱི་ཐོ་གཞུང་ཚག་ཤད་ཀྱིས་བཅད་ནས་འཇུག་པ།)
+pageRemover.submit=ཤོག་ངོས་སུབ་པ།
+pageRemover.placeholder=(དཔེར་ན། 1,2,6 ཡང་ན་ 1-10,15-30)
 
 
 #rotate
 rotate.title=Rotate PDF
-rotate.header=Rotate PDF
-rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
-rotate.submit=Rotate
+rotate.header=PDF འཁོར་སྐྱོད།
+rotate.selectAngle=འཁོར་སྐྱོད་ཀྱི་ཟུར་ཚད་འདེམས་པ། (ཟུར་ཚད་ 90 ཡི་སྒྱུར་ཐོབ་ནང་དུ།)
+rotate.submit=འཁོར་སྐྱོད།
 
 
 #split-pdfs
-split.title=Split PDF
-split.header=Split PDF
-split.desc.1=The numbers you select are the page number you wish to do a split on
-split.desc.2=As such selecting 1,3,7-9 would split a 10 page document into 6 separate PDFS with:
-split.desc.3=Document #1: Page 1
-split.desc.4=Document #2: Page 2 and 3
-split.desc.5=Document #3: Page 4, 5, 6 and 7
+split.title=PDF ཁ་གྱེས།
+split.header=PDF ཁ་གྱེས།
+split.desc.1=ཁྱེད་ཀྱིས་འདེམས་པའི་ཨང་གྲངས་རྣམས་ནི་ཁ་གྱེས་བྱ་རྒྱུའི་ཤོག་ངོས་ཨང་གྲངས་ཡིན།
+split.desc.2=དེ་ལྟར་ཤོག་ངོས་ 10 ཡོད་པའི་ཡིག་ཆ་ཞིག་ལ་ 1,3,7-9 འདེམས་ན་ PDF ཡིག་ཆ་ 6 ལ་ཁ་གྱེས་ཏེ།
+split.desc.3=ཡིག་ཆ་ #1: ཤོག་ངོས་ 1
+split.desc.4=ཡིག་ཆ་ #2: ཤོག་ངོས་ 2 དང་ 3
+split.desc.5=ཡིག་ཆ་ #3: ཤོག་ངོས་ 4, 5, 6 དང་ 7
 split.desc.6=Document #4: Page 8
 split.desc.7=Document #5: Page 9
-split.desc.8=Document #6: Page 10
-split.splitPages=Enter pages to split on:
-split.submit=Split
+split.desc.8=ཡིག་ཆ་ #6: ཤོག་ངོས་ 10
+split.splitPages=ཁ་གྱེས་བྱ་རྒྱུའི་ཤོག་ངོས་འཇུག་པ།
+split.submit=ཁ་གྱེས།
 
 
 #merge
-imageToPDF.title=Image to PDF
-imageToPDF.header=Image to PDF
-imageToPDF.submit=Convert
-imageToPDF.selectLabel=Image Fit Options
-imageToPDF.fillPage=Fill Page
-imageToPDF.fitDocumentToImage=Fit Page to Image
-imageToPDF.maintainAspectRatio=Maintain Aspect Ratios
-imageToPDF.selectText.2=Auto rotate PDF
-imageToPDF.selectText.3=Multi file logic (Only enabled if working with multiple images)
-imageToPDF.selectText.4=Merge into single PDF
-imageToPDF.selectText.5=Convert to separate PDFs
+imageToPDF.title=པར་རིས་ནས་ PDF ལ།
+imageToPDF.header=པར་རིས་ནས་ PDF ལ།
+imageToPDF.submit=བསྒྱུར་བ།
+imageToPDF.selectLabel=པར་རིས་འཚམ་སྒྲིག་གདམ་ག
+imageToPDF.fillPage=ཤོག་ངོས་བཀང་བ།
+imageToPDF.fitDocumentToImage=ཤོག་ངོས་པར་རིས་དང་འཚམ་པར་བཟོ་བ།
+imageToPDF.maintainAspectRatio=བསྡུར་ཚད་རྒྱུན་འཁྱོངས།
+imageToPDF.selectText.2=PDF འཁོར་སྐྱོད་བྱ་རྒྱུའི།
+imageToPDF.selectText.3=ཡིག་ཆ་མང་པོའི་གཏན་ཚིགས། (པར་རིས་མང་པོ་དང་མཉམ་དུ་ལས་ཀ་བྱེད་སྐབས་ཁོ་ནར་སྤྱོད་ཆོག)
+imageToPDF.selectText.4=PDF གཅིག་ཏུ་སྡེབ་སྦྱོར།
+imageToPDF.selectText.5=PDF སོ་སོར་བསྒྱུར་བ།
 
 
 #pdfToImage
-pdfToImage.title=PDF to Image
-pdfToImage.header=PDF to Image
-pdfToImage.selectText=Image Format
-pdfToImage.singleOrMultiple=Page to Image result type
-pdfToImage.single=Single Big Image Combing all pages
-pdfToImage.multi=Multiple Images, one image per page
-pdfToImage.colorType=Colour type
-pdfToImage.color=Colour
-pdfToImage.grey=Greyscale
-pdfToImage.blackwhite=Black and White (May lose data!)
-pdfToImage.submit=Convert
-pdfToImage.info=Python is not installed. Required for WebP conversion.
-pdfToImage.placeholder=(e.g. 1,2,8 or 4,7,12-16 or 2n-1)
+pdfToImage.title=PDF ནས་པར་རིས་ལ།
+pdfToImage.header=PDF ནས་པར་རིས་ལ།
+pdfToImage.selectText=པར་རིས་རྣམ་གཞག
+pdfToImage.singleOrMultiple=ཤོག་ངོས་ནས་པར་རིས་ཀྱི་འབྲས་བུའི་རིགས།
+pdfToImage.single=ཤོག་ངོས་ཚང་མ་མཉམ་དུ་སྦྱར་བའི་པར་རིས་ཆེན་པོ་གཅིག
+pdfToImage.multi=པར་རིས་མང་པོ། ཤོག་ངོས་རེར་པར་རིས་རེ།
+pdfToImage.colorType=ཚོས་མདོག་གི་རིགས།
+pdfToImage.color=ཚོས་མདོག
+pdfToImage.grey=སྐྱ་མདོག
+pdfToImage.blackwhite=དཀར་ནག (གནས་ཚུལ་བརླག་སྲིད།)
+pdfToImage.submit=བསྒྱུར་བ།
+pdfToImage.info=Python སྒྲིག་འཇུག་བྱས་མི་འདུག WebP བསྒྱུར་བར་དགོས་མཁོ་ཡིན།
+pdfToImage.placeholder=(དཔེར་ན། 1,2,8 ཡང་ན་ 4,7,12-16 ཡང་ན་ 2n-1)
 
 
 #addPassword
-addPassword.title=Add Password
-addPassword.header=Add password (Encrypt)
-addPassword.selectText.1=Select PDF to encrypt
-addPassword.selectText.2=User Password
-addPassword.selectText.3=Encryption Key Length
-addPassword.selectText.4=Higher values are stronger, but lower values have better compatibility.
-addPassword.selectText.5=Permissions to set (Recommended to be used along with Owner password)
-addPassword.selectText.6=Prevent assembly of document
-addPassword.selectText.7=Prevent content extraction
-addPassword.selectText.8=Prevent extraction for accessibility
-addPassword.selectText.9=Prevent filling in form
-addPassword.selectText.10=Prevent modification
-addPassword.selectText.11=Prevent annotation modification
-addPassword.selectText.12=Prevent printing
+addPassword.title=གསང་ཚིག་སྣོན་པ།
+addPassword.header=གསང་ཚིག་སྣོན་པ། (གསང་སྡོམ།)
+addPassword.selectText.1=གསང་སྡོམ་བྱ་རྒྱུའི་ PDF འདེམས་པ།
+addPassword.selectText.2=སྤྱོད་མཁན་གྱི་གསང་ཚིག
+addPassword.selectText.3=གསང་སྡོམ་ལྡེ་མིག་གི་རིང་ཚད།
+addPassword.selectText.4=ཚད་མཐོ་བ་རྣམས་སྲ་བརྟན་ཆེ་བ་ཡོད། འོན་ཀྱང་ཚད་དམའ་བ་རྣམས་འཆམ་མཐུན་རང་བཞིན་བཟང་བ་ཡོད།
+addPassword.selectText.5=ཆོག་མཆན་སྒྲིག་འགོད། (བདག་པོའི་གསང་ཚིག་དང་མཉམ་དུ་བེད་སྤྱོད་བྱེད་པར་འོས་སྦྱོར་བྱེད།)
+addPassword.selectText.6=ཡིག་ཆ་སྒྲིག་སྦྱོར་འགོག་པ།
+addPassword.selectText.7=ནང་དོན་ཕྱིར་འདོན་འགོག་པ།
+addPassword.selectText.8=མཐུན་རྐྱེན་གྱི་ཆེད་དུ་ཕྱིར་འདོན་འགོག་པ།
+addPassword.selectText.9=འགེངས་ཤོག་བཀང་བ་འགོག་པ།
+addPassword.selectText.10=བཟོ་བཅོས་འགོག་པ།
+addPassword.selectText.11=མཆན་འགྲེལ་བཟོ་བཅོས་འགོག་པ།
+addPassword.selectText.12=Prevent printin
 addPassword.selectText.13=Prevent printing different formats
-addPassword.selectText.14=Owner Password
-addPassword.selectText.15=Restricts what can be done with the document once it is opened (Not supported by all readers)
-addPassword.selectText.16=Restricts the opening of the document itself
-addPassword.submit=Encrypt
+addPassword.selectText.14=སྤྱོད་མཁན་གྱི་གསང་གྲངས།
+addPassword.selectText.15=ཡིག་ཚགས་རང་སྟེང་ཁ་ཕྱེས་རྒྱུར་བཀག་སྡོམ་བྱེད། འདི་ལྟར་བྱས་ན་ཀློག་ཆས་ཀྱིས་ནུས་པ་ཐོན་པ་པའི་ངེས་པ་མེད།
+addPassword.selectText.16=ཡིག་ཚགས་རང་སྟེང་ཁ་ཕྱེས་རྒྱུར་བཀག་སྡོམ་བྱེད།
+addPassword.submit=གསང་བསྒྱུར།
 
 
 #watermark
-watermark.title=Add Watermark
-watermark.header=Add Watermark
-watermark.customColor=Custom Text Colour
-watermark.selectText.1=Select PDF to add watermark to:
-watermark.selectText.2=Watermark Text:
-watermark.selectText.3=Font Size:
-watermark.selectText.4=Rotation (0-360):
-watermark.selectText.5=Width Spacer (Space between each watermark horizontally):
-watermark.selectText.6=Height Spacer (Space between each watermark vertically):
-watermark.selectText.7=Opacity (0% - 100%):
-watermark.selectText.8=Watermark Type:
-watermark.selectText.9=Watermark Image:
-watermark.selectText.10=Convert PDF to PDF-Image
-watermark.submit=Add Watermark
-watermark.type.1=Text
-watermark.type.2=Image
+watermark.title=རྟ�ས་ཐེལ་སྣོན་པ།
+watermark.header=རྟགས་ཐེལ་སྣོན་པ།
+watermark.customColor=ཡི་གེའི་ཚོས་མདོག་རང་སྒྲིག
+watermark.selectText.1=རྟགས་ཐེལ་སྣོན་རྒྱུའི་ PDF འདེམས་པ།
+watermark.selectText.2=རྟགས་ཐེལ་གྱི་ཡི་གེ།
+watermark.selectText.3=ཡིག་གཟུགས་ཆེ་ཆུང་།
+watermark.selectText.4=འཁོར་སྐྱོད། (0-360)
+watermark.selectText.5=ཞེང་ཚད་བར་སྟོང་། (རྟགས་ཐེལ་རེ་རེའི་བར་གྱི་གཞུང་ཕྱོགས་བར་ཐག)
+watermark.selectText.6=མཐོ་ཚད་བར་སྟོང་། (རྟགས་ཐེལ་རེ་རེའི་བར་གྱི་གྱེན་ཕྱོགས་བར་ཐག)
+watermark.selectText.7=གསལ་ཚད། (0% - 100%)
+watermark.selectText.8=རྟགས་ཐེལ་གྱི་རིགས།
+watermark.selectText.9=རྟགས་ཐེལ་གྱི་པར་རིས།
+watermark.selectText.10=PDF ནས་ PDF-པར་རིས་ལ་བསྒྱུར་བ།
+watermark.submit=རྟགས་ཐེལ་སྣོན་པ།
+watermark.type.1=ཡི་གེ
+watermark.type.2=པར་རིས།
 
 
 #Change permissions
-permissions.title=Change Permissions
-permissions.header=Change Permissions
-permissions.warning=Warning to have these permissions be unchangeable it is recommended to set them with a password via the add-password page
-permissions.selectText.1=Select PDF to change permissions
-permissions.selectText.2=Permissions to set
-permissions.selectText.3=Prevent assembly of document
-permissions.selectText.4=Prevent content extraction
-permissions.selectText.5=Prevent extraction for accessibility
-permissions.selectText.6=Prevent filling in form
-permissions.selectText.7=Prevent modification
-permissions.selectText.8=Prevent annotation modification
-permissions.selectText.9=Prevent printing
-permissions.selectText.10=Prevent printing different formats
-permissions.submit=Change
+permissions.title=ཆོག་མཆན་བསྒྱུར་བ།
+permissions.header=ཆོག་མཆན་བསྒྱུར་བ།
+permissions.warning=ཉེན་བརྡ། ཆོག་མཆན་འདི་དག་བསྒྱུར་མི་ཐུབ་པ་བཟོ་དགོས་ན། གསང་ཚིག་སྣོན་པའི་ཤོག་ངོས་བརྒྱུད་ནས་གསང་ཚིག་དང་མཉམ་དུ་སྒྲིག་འགོད་བྱེད་པའི་འོས་སྦྱོར་ཡོད།
+permissions.selectText.1=ཆོག་མཆན་བསྒྱུར་རྒྱུའི་ PDF འདེམས་པ།
+permissions.selectText.2=སྒྲིག་འགོད་བྱ་རྒྱུའི་ཆོག་མཆན།
+permissions.selectText.3=ཡིག་ཆ་སྡེབ་སྒྲིག་འགོག་པ།
+permissions.selectText.4=ནང་དོན་ཕྱིར་འདོན་འགོག་པ།
+permissions.selectText.5=མཐུན་རྐྱེན་གྱི་ཆེད་དུ་ཕྱིར་འདོན་འགོག་པ།
+permissions.selectText.6=འགེངས་ཤོག་བཀང་བ་འགོག་པ།
+permissions.selectText.7=བཟོ་བཅོས་འགོག་པ།
+permissions.selectText.8=མཆན་འགྲེལ་བཟོ་བཅོས་འགོག་པ།
+permissions.selectText.9=པར་འདེབས་འགོག་པ།
+permissions.selectText.10=པར་འདེབས་རྣམ་པ་མི་འདྲ་བ་འགོག་པ།
+permissions.submit=བསྒྱུར་བ།
 
 
 #remove password
-removePassword.title=Remove password
-removePassword.header=Remove password (Decrypt)
-removePassword.selectText.1=Select PDF to Decrypt
-removePassword.selectText.2=Password
-removePassword.submit=Remove
+removePassword.title=གསང་ཚིག་སུབ་པ།
+removePassword.header=གསང་ཚིག་སུབ་པ། (གསང་སྡོམ་གྲོལ་བ།)
+removePassword.selectText.1=གསང་སྡོམ་གྲོལ་རྒྱུའི་ PDF འདེམས་པ།
+removePassword.selectText.2=གསང་ཚིག
+removePassword.submit=སུབ་པ།
 
 
 #changeMetadata
-changeMetadata.title=Change Metadata
-changeMetadata.header=Change Metadata
-changeMetadata.selectText.1=Please edit the variables you wish to change
-changeMetadata.selectText.2=Delete all metadata
-changeMetadata.selectText.3=Show Custom Metadata:
-changeMetadata.author=Author:
-changeMetadata.creationDate=Creation Date (yyyy/MM/dd HH:mm:ss):
-changeMetadata.creator=Creator:
-changeMetadata.keywords=Keywords:
-changeMetadata.modDate=Modification Date (yyyy/MM/dd HH:mm:ss):
-changeMetadata.producer=Producer:
-changeMetadata.subject=Subject:
-changeMetadata.trapped=Trapped:
-changeMetadata.selectText.4=Other Metadata:
-changeMetadata.selectText.5=Add Custom Metadata Entry
-changeMetadata.submit=Change
+changeMetadata.title=གནས་ཚུལ་ཞིབ་ཕྲ་བསྒྱུར་བ།
+changeMetadata.header=གནས་ཚུལ་ཞིབ་ཕྲ་བསྒྱུར་བ།
+changeMetadata.selectText.1=བསྒྱུར་འདོད་པའི་འགྱུར་ཚད་རྣམས་རྩོམ་སྒྲིག་བྱེད་རོགས།
+changeMetadata.selectText.2=གནས་ཚུལ་ཞིབ་ཕྲ་ཚང་མ་སུབ་པ།
+changeMetadata.selectText.3=རང་སྒྲིག་གནས་ཚུལ་ཞིབ་ཕྲ་སྟོན།
+changeMetadata.author=རྩོམ་པ་པོ།
+changeMetadata.creationDate=བཟོ་བའི་དུས་ཚོད། (yyyy/MM/dd HH:mm:ss)
+changeMetadata.creator=བཟོ་མཁན།
+changeMetadata.keywords=གནད་ཚིག
+changeMetadata.modDate=བཟོ་བཅོས་དུས་ཚོད། (yyyy/MM/dd HH:mm:ss)
+changeMetadata.producer=སྐྲུན་མཁན།
+changeMetadata.subject=བརྗོད་གཞི།
+changeMetadata.trapped=བཟུང་བ།
+changeMetadata.selectText.4=གནས་ཚུལ་ཞིབ་ཕྲ་གཞན།
+changeMetadata.selectText.5=རང་སྒྲིག་གནས་ཚུལ་ཞིབ་ཕྲ་གསར་སྣོན།
+changeMetadata.submit=བསྒྱུར་བ།
 
 #unlockPDFForms
 unlockPDFForms.title=Remove Read-Only from Form Fields
@@ -1426,123 +1427,123 @@ unlockPDFForms.header=Unlock PDF Forms
 unlockPDFForms.submit=Remove
 
 #pdfToPDFA
-pdfToPDFA.title=PDF To PDF/A
-pdfToPDFA.header=PDF To PDF/A
-pdfToPDFA.credit=This service uses libreoffice for PDF/A conversion
-pdfToPDFA.submit=Convert
-pdfToPDFA.tip=Currently does not work for multiple inputs at once
-pdfToPDFA.outputFormat=Output format
-pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
+pdfToPDFA.title=PDF ནས་ PDF/A ལ།
+pdfToPDFA.header=PDF ནས་ PDF/A ལ།
+pdfToPDFA.credit=ཞབས་ཞུ་འདིས་ PDF/A བསྒྱུར་བའི་ཆེད་དུ་ libreoffice བེད་སྤྱོད་བྱེད་པ།
+pdfToPDFA.submit=བསྒྱུར་བ།
+pdfToPDFA.tip=ད་ལྟ་ཡིག་ཆ་མང་པོ་དུས་གཅིག་ལ་བསྒྱུར་མི་ཐུབ།
+pdfToPDFA.outputFormat=ཕྱིར་འདོན་རྣམ་གཞག
+pdfToPDFA.pdfWithDigitalSignature=PDF འདིར་ཨང་ཀིའི་མིང་རྟགས་ཡོད། འདི་རྗེས་མའི་རིམ་པར་སུབ་ངེས་ཡིན།
 
 
 #PDFToWord
-PDFToWord.title=PDF to Word
-PDFToWord.header=PDF to Word
-PDFToWord.selectText.1=Output file format
-PDFToWord.credit=This service uses LibreOffice for file conversion.
-PDFToWord.submit=Convert
+PDFToWord.title=PDF ནས་ Word ལ།
+PDFToWord.header=PDF ནས་ Word ལ།
+PDFToWord.selectText.1=ཕྱིར་འདོན་ཡིག་ཆའི་རྣམ་གཞག
+PDFToWord.credit=ཞབས་ཞུ་འདིས་ཡིག་ཆ་བསྒྱུར་བའི་ཆེད་དུ་ LibreOffice བེད་སྤྱོད་བྱེད་པ།
+PDFToWord.submit=བསྒྱུར་བ།
 
 
 #PDFToPresentation
-PDFToPresentation.title=PDF to Presentation
-PDFToPresentation.header=PDF to Presentation
-PDFToPresentation.selectText.1=Output file format
+PDFToPresentation.title=PDF ནས་སྤྱན་འབུལ་ལ།
+PDFToPresentation.header=PDF ནས་སྤྱན་འབུལ་ལ།
+PDFToPresentation.selectText.1=ཕྱིར་འདོན་ཡིག་ཆའི་རྣམ་གཞག
 PDFToPresentation.credit=This service uses LibreOffice for file conversion.
 PDFToPresentation.submit=Convert
 
 
 #PDFToText
-PDFToText.title=PDF to RTF (Text)
-PDFToText.header=PDF to RTF (Text)
-PDFToText.selectText.1=Output file format
+PDFToText.title=PDF ནས་ RTF ལ། (ཡི་གེ)
+PDFToText.header=PDF ནས་ RTF ལ། (ཡི་གེ)
+PDFToText.selectText.1=ཕྱིར་འདོན་ཡིག་ཆའི་རྣམ་གཞག
 PDFToText.credit=This service uses LibreOffice for file conversion.
 PDFToText.submit=Convert
 
 
 #PDFToHTML
-PDFToHTML.title=PDF to HTML
-PDFToHTML.header=PDF to HTML
+PDFToHTML.title=PDF ནས་ HTML ལ།
+PDFToHTML.header=PDF ནས་ HTML ལ།
 PDFToHTML.credit=This service uses pdftohtml for file conversion.
 PDFToHTML.submit=Convert
 
 
 #PDFToXML
-PDFToXML.title=PDF to XML
-PDFToXML.header=PDF to XML
+PDFToXML.title=PDF ནས་ XML ལ།
+PDFToXML.header=PDF ནས་ XML ལ།
 PDFToXML.credit=This service uses LibreOffice for file conversion.
 PDFToXML.submit=Convert
 
 #PDFToCSV
-PDFToCSV.title=PDF to CSV
-PDFToCSV.header=PDF to CSV
+PDFToCSV.title=PDF ནས་ CSV ལ།
+PDFToCSV.header=PDF ནས་ CSV ལ།
 PDFToCSV.prompt=Choose page to extract table
 PDFToCSV.submit=Extract
 
 #split-by-size-or-count
-split-by-size-or-count.title=Split PDF by Size or Count
-split-by-size-or-count.header=Split PDF by Size or Count
-split-by-size-or-count.type.label=Select Split Type
-split-by-size-or-count.type.size=By Size
-split-by-size-or-count.type.pageCount=By Page Count
-split-by-size-or-count.type.docCount=By Document Count
-split-by-size-or-count.value.label=Enter Value
-split-by-size-or-count.value.placeholder=Enter size (e.g., 2MB or 3KB) or count (e.g., 5)
-split-by-size-or-count.submit=Submit
+split-by-size-or-count.title=�ེ་ཆུང་ངམ་གྲངས་ཀ་ལྟར་ PDF ཁ་གྱེས།
+split-by-size-or-count.header=ཆེ་ཆུང་ངམ་གྲངས་ཀ་ལྟར་ PDF ཁ་གྱེས།
+split-by-size-or-count.type.label=ཁ་གྱེས་རིགས་འདེམས་པ།
+split-by-size-or-count.type.size=ཆེ་ཆུང་ལྟར།
+split-by-size-or-count.type.pageCount=ཤོག་གྲངས་ལྟར།
+split-by-size-or-count.type.docCount=ཡིག་ཆའི་གྲངས་ཀ་ལྟར།
+split-by-size-or-count.value.label=གྲངས་ཐང་འཇུག་པ།
+split-by-size-or-count.value.placeholder=ཆེ་ཆུང་ (དཔེར་ན། 2MB ཡང་ན་ 3KB) ཡང་ན་གྲངས་ཀ་ (དཔེར་ན། 5) འཇུག་པ།
+split-by-size-or-count.submit=ཕུལ་བ།
 
 
 #overlay-pdfs
-overlay-pdfs.header=Overlay PDF Files
-overlay-pdfs.baseFile.label=Select Base PDF File
-overlay-pdfs.overlayFiles.label=Select Overlay PDF Files
-overlay-pdfs.mode.label=Select Overlay Mode
-overlay-pdfs.mode.sequential=Sequential Overlay
-overlay-pdfs.mode.interleaved=Interleaved Overlay
-overlay-pdfs.mode.fixedRepeat=Fixed Repeat Overlay
-overlay-pdfs.counts.label=Overlay Counts (for Fixed Repeat Mode)
-overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
-overlay-pdfs.position.label=Select Overlay Position
-overlay-pdfs.position.foreground=Foreground
-overlay-pdfs.position.background=Background
-overlay-pdfs.submit=Submit
+overlay-pdfs.header=PDF ཡིག་ཆ་བརྩེགས་པ།
+overlay-pdfs.baseFile.label=གཞི་རྩའི་ PDF ཡིག་ཆ་འདེམས་པ།
+overlay-pdfs.overlayFiles.label=བརྩེགས་རྒྱུའི་ PDF ཡིག་ཆ་འདེམས་པ།
+overlay-pdfs.mode.label=བརྩེགས་སྟངས་འདེམས་པ།
+overlay-pdfs.mode.sequential=རིམ་བཞིན་བརྩེགས་པ།
+overlay-pdfs.mode.interleaved=སྤེལ་མར་བརྩེགས་པ།
+overlay-pdfs.mode.fixedRepeat=བསྐྱར་ཟློས་གཏན་འཇགས་བརྩེགས་པ།
+overlay-pdfs.counts.label=བརྩེགས་གྲངས། (བསྐྱར་ཟློས་གཏན་འཇགས་རྣམ་པའི་ཆེད།)
+overlay-pdfs.counts.placeholder=ཚེག་ཁྱིམ་གྱིས་བཅད་པའི་གྲངས་ཀ་འཇུག་པ། (དཔེར་ན། 2,3,1)
+overlay-pdfs.position.label=བརྩེགས་སའི་གནས་ས་འདེམས་པ།
+overlay-pdfs.position.foreground=མདུན་ངོས།
+overlay-pdfs.position.background=རྒྱབ་ལྗོངས།
+overlay-pdfs.submit=ཕུལ་བ།
 
 
 #split-by-sections
-split-by-sections.title=Split PDF by Sections
-split-by-sections.header=Split PDF into Sections
-split-by-sections.horizontal.label=Horizontal Divisions
-split-by-sections.vertical.label=Vertical Divisions
-split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
-split-by-sections.vertical.placeholder=Enter number of vertical divisions
-split-by-sections.submit=Split PDF
-split-by-sections.merge=Merge Into One PDF
+split-by-sections.title=�་ཤས་ལྟར་ PDF ཁ་གྱེས།
+split-by-sections.header=PDF ཆ་ཤས་སུ་ཁ་གྱེས།
+split-by-sections.horizontal.label=གཞུང་ཕྱོགས་བགོ་བཤའ།
+split-by-sections.vertical.label=གྱེན་ཕྱོགས་བགོ་བཤའ།
+split-by-sections.horizontal.placeholder=གཞུང་ཕྱོགས་བགོ་བཤའི་གྲངས་ཀ་འཇུག་པ།
+split-by-sections.vertical.placeholder=གྱེན་ཕྱོགས་བགོ་བཤའི་གྲངས་ཀ་འཇུག་པ།
+split-by-sections.submit=PDF ཁ་གྱེས།
+split-by-sections.merge=PDF གཅིག་ཏུ་སྡེབ་སྦྱོར།
 
 
 #printFile
-printFile.title=Print File
-printFile.header=Print File to Printer
-printFile.selectText.1=Select File to Print
-printFile.selectText.2=Enter Printer Name
-printFile.submit=Print
+printFile.title=ཡིག་ཆ་པར་འདེབས།
+printFile.header=ཡིག་ཆ་པར་འདེབས་འཕྲུལ་འཁོར་ལ་པར་འདེབས།
+printFile.selectText.1=པར་འདེབས་བྱ་རྒྱུའི་ཡིག་ཆ་འདེམས་པ།
+printFile.selectText.2=པར་འདེབས་འཕྲུལ་འཁོར་གྱི་མིང་འཇུག་པ།
+printFile.submit=པར་འདེབས།
 
 
 #licenses
-licenses.nav=Licences
-licenses.title=3rd Party Licences
-licenses.header=3rd Party Licences
-licenses.module=Module
-licenses.version=Version
-licenses.license=Licence
+licenses.nav=ཆོག་མཆན།
+licenses.title=ཕྱི་ཡི་ཆོག་མཆན།
+licenses.header=ཕྱི་ཡི་ཆོག་མཆན།
+licenses.module=སྡེ་ཚན།
+licenses.version=པར་གཞི།
+licenses.license=ཆོག་མཆན།
 
 #survey
-survey.nav=Survey
-survey.title=Stirling-PDF Survey
-survey.description=Stirling-PDF has no tracking so we want to hear from our users to improve Stirling-PDF!
-survey.changes=Stirling-PDF has changed since the last survey! To find out more please check our blog post here:
-survey.changes2=With these changes we are getting paid business support and funding
-survey.please=Please consider taking our survey to have input on the future of Stirling-PDF!
-survey.disabled=(Survey popup will be disabled in following updates but available at foot of page)
-survey.button=Take Survey
-survey.dontShowAgain=Don't show again
+survey.nav=བསམ་ཞིབ།
+survey.title=Stirling-PDF བསམ་ཞིབ།
+survey.description=Stirling-PDF ལ་རྗེས་འདེད་མེད་པས། ང་ཚོས་ Stirling-PDF ཡར་རྒྱས་གཏོང་བའི་ཆེད་དུ་སྤྱོད་མཁན་ཚོའི་བསམ་འཆར་ཉན་འདོད་ཡོད།
+survey.changes=བསམ་ཞིབ་སྔ་མ་ནས་བཟུང་ Stirling-PDF ལ་འགྱུར་བ་བྱུང་ཡོད། དེའི་སྐོར་ལ་གནས་ཚུལ་མང་བ་ཤེས་འདོད་ན་ང་ཚོའི་རྩོམ་ཡིག་འདིར་གཟིགས་རོགས།
+survey.changes2=འགྱུར་བ་འདི་དག་དང་མཉམ་དུ་ང་ཚོར་ཚོང་དོན་རྒྱབ་སྐྱོར་དང་མ་དངུལ་ཐོབ་བཞིན་ཡོད།
+survey.please=Stirling-PDF ཡི་མ་འོངས་པའི་ཐད་ལ་ནུས་པ་ཐོན་པའི་ཆེད་དུ་ང་ཚོའི་བསམ་ཞིབ་ནང་མཉམ་ཞུགས་གནང་རོགས།
+survey.disabled=(བསམ་ཞིབ་སྒེའུ་ཁུང་རྗེས་མའི་གསར་སྒྱུར་ནང་སྒོ་རྒྱག་རྒྱུ་ཡིན་ཡང་ཤོག་ངོས་མཇུག་ཏུ་ཡོད་རྒྱུ་ཡིན།)
+survey.button=བསམ་ཞིབ་བྱེད་པ།
+survey.dontShowAgain=ཡང་བསྐྱར་མ་སྟོན།
 survey.meeting.1=If you're using Stirling PDF at work, we'd love to speak to you. We're offering technical support sessions in exchange for a 15 minute user discovery session.
 survey.meeting.2=This is a chance to:
 survey.meeting.3=Get help with deployment, integrations, or troubleshooting
@@ -1554,87 +1555,87 @@ survey.meeting.notInterested=Not a business and/or interested in a meeting?
 survey.meeting.button=Book meeting
 
 #error
-error.sorry=Sorry for the issue!
-error.needHelp=Need help / Found an issue?
-error.contactTip=If you're still having trouble, don't hesitate to reach out to us for help. You can submit a ticket on our GitHub page or contact us through Discord:
-error.404.head=404 - Page Not Found | Oops, we tripped in the code!
-error.404.1=We can't seem to find the page you're looking for.
-error.404.2=Something went wrong
-error.github=Submit a ticket on GitHub
-error.showStack=Show Stack Trace
-error.copyStack=Copy Stack Trace
-error.githubSubmit=GitHub - Submit a ticket
-error.discordSubmit=Discord - Submit Support post
+error.sorry=དཀའ་ངལ་ལ་དགོངས་དག
+error.needHelp=རོགས་རམ་དགོས་སམ། / དཀའ་ངལ་ཞིག་རྙེད་སོང་ངམ།
+error.contactTip=གལ་སྲིད་ད་དུང་དཀའ་ངལ་འཕྲད་བཞིན་ཡོད་ན། རོགས་རམ་ཞུ་བར་ང་ཚོར་འབྲེལ་གཏུག་བྱེད་རོགས། ཁྱེད་ཀྱིས་ང་ཚོའི་ GitHub ཤོག་ངོས་སུ་སྙན་ཞུ་འབུལ་བའམ་ Discord བརྒྱུད་ནས་འབྲེལ་བ་གནང་ཆོག
+error.404.head=404 - ཤོག་ངོས་མ་རྙེད། | དགོངས་པ་མ་ཚོམ། ང་ཚོ་ཚབས་ཆེའི་ནོར་འཁྲུལ་ཞིག་བྱུང་སོང་།
+error.404.1=ཁྱེད་ཀྱིས་འཚོལ་བཞིན་པའི་ཤོག་ངོས་དེ་རྙེད་ཐུབ་ཀྱི་མི་འདུག
+error.404.2=ནོར་འཁྲུལ་ཞིག་བྱུང་སོང་།
+error.github=GitHub སྟེང་དུ་སྙན་ཞུ་འབུལ་བ།
+error.showStack=Stack Trace སྟོན།
+error.copyStack=Stack Trace པར་སློག
+error.githubSubmit=GitHub - སྙན་ཞུ་འབུལ་བ།
+error.discordSubmit=Discord - རྒྱབ་སྐྱོར་སྙན་ཞུ་འབུལ་བ།
 
 
 #remove-image
-removeImage.title=Remove image
-removeImage.header=Remove image
-removeImage.removeImage=Remove image
-removeImage.submit=Remove image
+removeImage.title=པ�་རིས་སུབ་པ།
+removeImage.header=པར་རིས་སུབ་པ།
+removeImage.removeImage=པར་རིས་སུབ་པ།
+removeImage.submit=པར་རིས་སུབ་པ།
 
 
-splitByChapters.title=Split PDF by Chapters
-splitByChapters.header=Split PDF by Chapters
-splitByChapters.bookmarkLevel=Bookmark Level
-splitByChapters.includeMetadata=Include Metadata
-splitByChapters.allowDuplicates=Allow Duplicates
+splitByChapters.title=ལེའ�་ལྟར་ PDF ཁ་གྱེས།
+splitByChapters.header=ལེའུ་ལྟར་ PDF ཁ་གྱེས།
+splitByChapters.bookmarkLevel=དཔེ་རྟགས་རིམ་པ།
+splitByChapters.includeMetadata=གནས་ཚུལ་ཞིབ་ཕྲ་ཚུད་པ།
+splitByChapters.allowDuplicates=བསྐྱར་ཟློས་ཆོག་པ།
 splitByChapters.desc.1=This tool splits a PDF file into multiple PDFs based on its chapter structure.
 splitByChapters.desc.2=Bookmark Level: Choose the level of bookmarks to use for splitting (0 for top-level, 1 for second-level, etc.).
-splitByChapters.desc.3=Include Metadata: If checked, the original PDF's metadata will be included in each split PDF.
+splitByChapters.desc.3=Include Metadata: If checked, the original PDF metadata will be included in each split PDF.
 splitByChapters.desc.4=Allow Duplicates: If checked, allows multiple bookmarks on the same page to create separate PDFs.
 splitByChapters.submit=Split PDF
 
 #File Chooser
-fileChooser.click=Click
-fileChooser.or=or
-fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Image file
-fileChooser.hoveredDragAndDrop=Drag & Drop file(s) here
-fileChooser.extractPDF=Extracting...
+fileChooser.click=སྤྱོད།
+fileChooser.or=ཡང་ན།
+fileChooser.dragAndDrop=འཐེན་ནས་འཇོག་པ།
+fileChooser.dragAndDropPDF=PDF ཡིག་ཆ་འཐེན་ནས་འཇོག་པ།
+fileChooser.dragAndDropImage=པར་རིས་ཡིག་ཆ་འཐེན་ནས་འཇོག་པ།
+fileChooser.hoveredDragAndDrop=ཡིག་ཆ་འདིར་འཐེན་ནས་འཇོག་པ།
+fileChooser.extractPDF=འདོན་རིས་འགྱུར་བའི་སྒྲིག་བཏང་བ།
 
 #release notes
-releases.footer=Releases
-releases.title=Release Notes
-releases.header=Release Notes
-releases.current.version=Current Release
-releases.note=Release notes are only available in English
+releases.footer=པར་གཞི།
+releases.title=པར་གཞི་གསར་པའི་གསལ་བསྒྲགས།
+releases.header=པར་གཞི་གསར་པའི་གསལ་བསྒྲགས།
+releases.current.version=མིག་སྔའི་པར་གཞི།
+releases.note=པར་གཞི་གསར་པའི་གསལ་བསྒྲགས་དབྱིན་ཡིག་ཁོ་ནར་ཡོད།
 
 #Validate Signature
-validateSignature.title=Validate PDF Signatures
-validateSignature.header=Validate Digital Signatures
-validateSignature.selectPDF=Select signed PDF file
-validateSignature.submit=Validate Signatures
-validateSignature.results=Validation Results
-validateSignature.status=Status
-validateSignature.signer=Signer
-validateSignature.date=Date
-validateSignature.reason=Reason
-validateSignature.location=Location
-validateSignature.noSignatures=No digital signatures found in this document
-validateSignature.status.valid=Valid
-validateSignature.status.invalid=Invalid
-validateSignature.chain.invalid=Certificate chain validation failed - cannot verify signer's identity
-validateSignature.trust.invalid=Certificate not in trust store - source cannot be verified
-validateSignature.cert.expired=Certificate has expired
-validateSignature.cert.revoked=Certificate has been revoked
-validateSignature.signature.info=Signature Information
-validateSignature.signature=Signature
-validateSignature.signature.mathValid=Signature is mathematically valid BUT:
-validateSignature.selectCustomCert=Custom Certificate File X.509 (Optional)
-validateSignature.cert.info=Certificate Details
-validateSignature.cert.issuer=Issuer
-validateSignature.cert.subject=Subject
-validateSignature.cert.serialNumber=Serial Number
-validateSignature.cert.validFrom=Valid From
-validateSignature.cert.validUntil=Valid Until
-validateSignature.cert.algorithm=Algorithm
-validateSignature.cert.keySize=Key Size
-validateSignature.cert.version=Version
-validateSignature.cert.keyUsage=Key Usage
-validateSignature.cert.selfSigned=Self-Signed
-validateSignature.cert.bits=bits
+validateSignature.title=PDF མིང་རྟགས་ར་སྤྲོད།
+validateSignature.header=ཨང་ཀིའི་མིང་རྟགས་ར་སྤྲོད།
+validateSignature.selectPDF=མིང་རྟགས་བཀོད་པའི་ PDF ཡིག་ཆ་འདེམས་པ།
+validateSignature.submit=མིང་རྟགས་ར་སྤྲོད།
+validateSignature.results=ར་སྤྲོད་འབྲས་བུ།
+validateSignature.status=གནས་སྟངས།
+validateSignature.signer=མིང་རྟགས་འགོད་མཁན།
+validateSignature.date=དུས་ཚོད།
+validateSignature.reason=རྒྱུ་མཚན།
+validateSignature.location=ས་གནས།
+validateSignature.noSignatures=ཡིག་ཆ་འདིའི་ནང་དུ་ཨང་ཀིའི་མིང་རྟགས་མ་རྙེད།
+validateSignature.status.valid=ནུས་ལྡན།
+validateSignature.status.invalid=ནུས་མེད།
+validateSignature.chain.invalid=ལག་ཁྱེར་བརྒྱུད་རིམ་ར་སྤྲོད་མ་འགྲུབ་པ། - མིང་རྟགས་འགོད་མཁན་གྱི་ངོ་སྤྲོད་ར་སྤྲོད་བྱེད་མི་ཐུབ།
+validateSignature.trust.invalid=ལག་ཁྱེར་ཡིད་ཆེས་མཛོད་ཁང་ནང་མེད་པ། - འབྱུང་ཁུངས་ར་སྤྲོད་བྱེད་མི་ཐུབ།
+validateSignature.cert.expired=ལག་ཁྱེར་དུས་ཡོལ་ཟིན།
+validateSignature.cert.revoked=ལག་ཁྱེར་ཕྱིར་འཐེན་བྱས་ཟིན།
+validateSignature.signature.info=མིང་རྟགས་ཀྱི་གནས་ཚུལ།
+validateSignature.signature=མིང་རྟགས།
+validateSignature.signature.mathValid=མིང་རྟགས་ཨང་རྩིས་ཐོག་ནས་ནུས་ལྡན་ཡིན་ཡང་།
+validateSignature.selectCustomCert=རང་སྒྲིག་ལག་ཁྱེར་ཡིག་ཆ་ X.509 (འདམ་ག)
+validateSignature.cert.info=ལག་ཁྱེར་ཞིབ་ཕྲ།
+validateSignature.cert.issuer=སྤྲོད་མཁན།
+validateSignature.cert.subject=བརྗོད་གཞི།
+validateSignature.cert.serialNumber=ཨང་གྲངས་གོ་རིམ།
+validateSignature.cert.validFrom=ནུས་ལྡན་འགོ་འཛུགས།
+validateSignature.cert.validUntil=ནུས་ལྡན་མཇུག་སྒྲིལ།
+validateSignature.cert.algorithm=བྱེད་ཐབས།
+validateSignature.cert.keySize=ལྡེ་མིག་ཆེ་ཆུང་།
+validateSignature.cert.version=པར་གཞི།
+validateSignature.cert.keyUsage=ལྡེ་མིག་བེད་སྤྱོད།
+validateSignature.cert.selfSigned=རང་མིང་རྟགས།
+validateSignature.cert.bits=གནས།
 
 ####################
 #  Cookie banner   #
diff --git a/stirling-pdf/src/main/resources/messages_ca_CA.properties b/stirling-pdf/src/main/resources/messages_ca_CA.properties
index c754aedb4..4e22c663d 100644
--- a/stirling-pdf/src/main/resources/messages_ca_CA.properties
+++ b/stirling-pdf/src/main/resources/messages_ca_CA.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=L’usuari actual no pot ser deshabilitat
 downgradeCurrentUserLongMessage=No es pot baixar la funció de l'usuari actual. Per tant, no es mostrarà l'usuari actual.
 userAlreadyExistsOAuthMessage=L’usuari ja existeix com a usuari OAuth2.
 userAlreadyExistsWebMessage=L’usuari ja existeix com a usuari web.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=Oops!
 help=Ajuda
diff --git a/stirling-pdf/src/main/resources/messages_cs_CZ.properties b/stirling-pdf/src/main/resources/messages_cs_CZ.properties
index 329985acd..efeccada9 100644
--- a/stirling-pdf/src/main/resources/messages_cs_CZ.properties
+++ b/stirling-pdf/src/main/resources/messages_cs_CZ.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Současný uživatel nemůže být deaktivován
 downgradeCurrentUserLongMessage=Nelze snížit roli současného uživatele. Proto současný uživatel nebude zobrazen.
 userAlreadyExistsOAuthMessage=Uživatel již existuje jako OAuth2 uživatel.
 userAlreadyExistsWebMessage=Uživatel již existuje jako webový uživatel.
+invalidRoleMessage=Invalid role.
 error=Chyba
 oops=Jejda!
 help=Nápověda
diff --git a/stirling-pdf/src/main/resources/messages_da_DK.properties b/stirling-pdf/src/main/resources/messages_da_DK.properties
index bb761325e..1b82abf8f 100644
--- a/stirling-pdf/src/main/resources/messages_da_DK.properties
+++ b/stirling-pdf/src/main/resources/messages_da_DK.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Den aktuelle bruger kan ikke deaktiveres
 downgradeCurrentUserLongMessage=Kan ikke nedgradere den aktuelle brugers rolle. Derfor vil den aktuelle bruger ikke blive vist.
 userAlreadyExistsOAuthMessage=Brugeren eksisterer allerede som en OAuth2-bruger.
 userAlreadyExistsWebMessage=Brugeren eksisterer allerede som en webbruger.
+invalidRoleMessage=Invalid role.
 error=Fejl
 oops=Ups!
 help=Hjælp
diff --git a/stirling-pdf/src/main/resources/messages_de_DE.properties b/stirling-pdf/src/main/resources/messages_de_DE.properties
index a08e75819..bfb302814 100644
--- a/stirling-pdf/src/main/resources/messages_de_DE.properties
+++ b/stirling-pdf/src/main/resources/messages_de_DE.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Der aktuelle Benutzer kann nicht deaktiviert werden
 downgradeCurrentUserLongMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden. Daher wird der aktuelle Benutzer nicht angezeigt.
 userAlreadyExistsOAuthMessage=Der Benutzer ist bereits als OAuth2-Benutzer vorhanden.
 userAlreadyExistsWebMessage=Der Benutzer ist bereits als Webbenutzer vorhanden.
+invalidRoleMessage=Invalid role.
 error=Fehler
 oops=Hoppla!
 help=Hilfe
@@ -1699,17 +1700,17 @@ fakeScan.resolution=Auflösung (DPI)
 
 
 # Table of Contents Feature
-home.editTableOfContents.title=Edit Table of Contents
-home.editTableOfContents.desc=Add or edit bookmarks and table of contents in PDF documents
+home.editTableOfContents.title=Inhaltsverzeichnis bearbeiten
+home.editTableOfContents.desc=Hinzufügen oder Bearbeiten von Lesezeichen und Inhaltsverzeichnissen in PDF-Dokumenten
 
-editTableOfContents.tags=bookmarks,toc,navigation,index,table of contents,chapters,sections,outline
-editTableOfContents.title=Edit Table of Contents
-editTableOfContents.header=Add or Edit PDF Table of Contents
-editTableOfContents.replaceExisting=Replace existing bookmarks (uncheck to append to existing)
-editTableOfContents.editorTitle=Bookmark Editor
-editTableOfContents.editorDesc=Add and arrange bookmarks below. Click + to add child bookmarks.
-editTableOfContents.addBookmark=Add New Bookmark
-editTableOfContents.desc.1=This tool allows you to add or edit the table of contents (bookmarks) in a PDF document.
-editTableOfContents.desc.2=You can create a hierarchical structure by adding child bookmarks to parent bookmarks.
-editTableOfContents.desc.3=Each bookmark requires a title and target page number.
-editTableOfContents.submit=Apply Table of Contents
+editTableOfContents.tags=Lesezeichen,Inhaltsverzeichnis,Navigation,Index,Kapitel,Abschnitte,Gliederung
+editTableOfContents.title=Inhaltsverzeichnis bearbeiten
+editTableOfContents.header=PDF-Inhaltsverzeichnis hinzufügen oder bearbeiten
+editTableOfContents.replaceExisting=Vorhandene Lesezeichen ersetzen (deaktivieren, um bestehende hinzuzufügen)
+editTableOfContents.editorTitle=Lesezeichen-Editor
+editTableOfContents.editorDesc=Fügen unten Lesezeichen hinzu und ordne sie an. Klicke auf +, um das untergeordnete Lesezeichen hinzuzufügen.
+editTableOfContents.addBookmark=Neues Lesezeichen hinzufügen
+editTableOfContents.desc.1=Mit diesem Werkzeug können Sie das Inhaltsverzeichnis (Lesezeichen) eines PDF-Dokuments hinzufügen oder bearbeiten.
+editTableOfContents.desc.2=Sie können eine hierarchische Struktur erstellen, indem Sie untergeordnete Lesezeichen zu übergeordneten hinzufügen.
+editTableOfContents.desc.3=Jedes Lesezeichen benötigt einen Titel und eine Seitenzahl.
+editTableOfContents.submit=Inhaltsverzeichnis anwenden
diff --git a/stirling-pdf/src/main/resources/messages_el_GR.properties b/stirling-pdf/src/main/resources/messages_el_GR.properties
index e9cf5b767..f206b5d6e 100644
--- a/stirling-pdf/src/main/resources/messages_el_GR.properties
+++ b/stirling-pdf/src/main/resources/messages_el_GR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Ο τρέχων χρήστης δεν μπορεί ν
 downgradeCurrentUserLongMessage=Δεν είναι δυνατή η υποβάθμιση του ρόλου του τρέχοντος χρήστη. Επομένως, ο τρέχων χρήστης δεν θα εμφανίζεται.
 userAlreadyExistsOAuthMessage=Ο χρήστης υπάρχει ήδη ως χρήστης OAuth2.
 userAlreadyExistsWebMessage=Ο χρήστης υπάρχει ήδη ως χρήστης web.
+invalidRoleMessage=Invalid role.
 error=Σφάλμα
 oops=Ωχ!
 help=Βοήθεια
diff --git a/stirling-pdf/src/main/resources/messages_en_GB.properties b/stirling-pdf/src/main/resources/messages_en_GB.properties
index 2ff019480..22cbfaf17 100644
--- a/stirling-pdf/src/main/resources/messages_en_GB.properties
+++ b/stirling-pdf/src/main/resources/messages_en_GB.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=Oops!
 help=Help
diff --git a/stirling-pdf/src/main/resources/messages_en_US.properties b/stirling-pdf/src/main/resources/messages_en_US.properties
index 9e438a948..7ce6816b7 100644
--- a/stirling-pdf/src/main/resources/messages_en_US.properties
+++ b/stirling-pdf/src/main/resources/messages_en_US.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Cannot downgrade current user's role. Hence, current user will not be shown.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=Oops!
 help=Help
diff --git a/stirling-pdf/src/main/resources/messages_es_ES.properties b/stirling-pdf/src/main/resources/messages_es_ES.properties
index 828b2b0bb..e35d4ae11 100644
--- a/stirling-pdf/src/main/resources/messages_es_ES.properties
+++ b/stirling-pdf/src/main/resources/messages_es_ES.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=El usuario actual no se puede deshabilitar
 downgradeCurrentUserLongMessage=No se puede degradar el rol del usuario actual. Por lo tanto, el usuario actual no se mostrará.
 userAlreadyExistsOAuthMessage=La usuario ya existe como usuario de OAuth2.
 userAlreadyExistsWebMessage=El usuario ya existe como usuario web.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=¡Ups!
 help=Ayuda
diff --git a/stirling-pdf/src/main/resources/messages_eu_ES.properties b/stirling-pdf/src/main/resources/messages_eu_ES.properties
index 74b1d38df..c492bd6fa 100644
--- a/stirling-pdf/src/main/resources/messages_eu_ES.properties
+++ b/stirling-pdf/src/main/resources/messages_eu_ES.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Ezin da uneko erabiltzailearen rola jaitsi. Beraz, oraingo erabiltzailea ez da erakutsiko.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=Oops!
 help=Help
diff --git a/stirling-pdf/src/main/resources/messages_fa_IR.properties b/stirling-pdf/src/main/resources/messages_fa_IR.properties
index 389be3b31..8974f88d3 100644
--- a/stirling-pdf/src/main/resources/messages_fa_IR.properties
+++ b/stirling-pdf/src/main/resources/messages_fa_IR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=کاربر فعلی نمی‌تواند غیرفعا
 downgradeCurrentUserLongMessage=نمی‌توان نقش کاربر فعلی را کاهش داد. بنابراین، کاربر فعلی نشان داده نخواهد شد.
 userAlreadyExistsOAuthMessage=این کاربر قبلاً به عنوان یک کاربر OAuth2 وجود دارد.
 userAlreadyExistsWebMessage=این کاربر قبلاً به عنوان یک کاربر وب وجود دارد.
+invalidRoleMessage=Invalid role.
 error=خطا
 oops=اوپس!
 help=راهنما
diff --git a/stirling-pdf/src/main/resources/messages_fr_FR.properties b/stirling-pdf/src/main/resources/messages_fr_FR.properties
index da088c212..0bd27d143 100644
--- a/stirling-pdf/src/main/resources/messages_fr_FR.properties
+++ b/stirling-pdf/src/main/resources/messages_fr_FR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=L'utilisateur actuel ne peut pas être désactivé
 downgradeCurrentUserLongMessage=Impossible de rétrograder le rôle de l'utilisateur actuel. Par conséquent, l'utilisateur actuel ne sera pas affiché.
 userAlreadyExistsOAuthMessage=L'utilisateur existe déjà en tant qu'utilisateur OAuth2.
 userAlreadyExistsWebMessage=L'utilisateur existe déjà en tant qu'utilisateur Web.
+invalidRoleMessage=Invalid role.
 error=Erreur
 oops=Oups !
 help=Aide
diff --git a/stirling-pdf/src/main/resources/messages_ga_IE.properties b/stirling-pdf/src/main/resources/messages_ga_IE.properties
index 19defaa17..4df8cf4b3 100644
--- a/stirling-pdf/src/main/resources/messages_ga_IE.properties
+++ b/stirling-pdf/src/main/resources/messages_ga_IE.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Ní féidir an t-úsáideoir reatha a dhíchumasú
 downgradeCurrentUserLongMessage=Ní féidir ról an úsáideora reatha a íosghrádú. Mar sin, ní thaispeánfar an t-úsáideoir reatha.
 userAlreadyExistsOAuthMessage=Tá an t-úsáideoir ann cheana mar úsáideoir OAuth2.
 userAlreadyExistsWebMessage=Tá an t-úsáideoir ann cheana féin mar úsáideoir gréasáin.
+invalidRoleMessage=Invalid role.
 error=Earráid
 oops=Úps!
 help=Cabhrú
diff --git a/stirling-pdf/src/main/resources/messages_hi_IN.properties b/stirling-pdf/src/main/resources/messages_hi_IN.properties
index f910c9afc..423c73065 100644
--- a/stirling-pdf/src/main/resources/messages_hi_IN.properties
+++ b/stirling-pdf/src/main/resources/messages_hi_IN.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=वर्तमान उपयोगकर्ता
 downgradeCurrentUserLongMessage=वर्तमान उपयोगकर्ता की भूमिका को डाउनग्रेड नहीं किया जा सकता। इसलिए, वर्तमान उपयोगकर्ता नहीं दिखाया जाएगा।
 userAlreadyExistsOAuthMessage=उपयोगकर्ता पहले से ही OAuth2 उपयोगकर्ता के रूप में मौजूद है।
 userAlreadyExistsWebMessage=उपयोगकर्ता पहले से ही वेब उपयोगकर्ता के रूप में मौजूद है।
+invalidRoleMessage=Invalid role.
 error=त्रुटि
 oops=उफ़!
 help=सहायता
diff --git a/stirling-pdf/src/main/resources/messages_hr_HR.properties b/stirling-pdf/src/main/resources/messages_hr_HR.properties
index 97c4b243c..35c05c550 100644
--- a/stirling-pdf/src/main/resources/messages_hr_HR.properties
+++ b/stirling-pdf/src/main/resources/messages_hr_HR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Trenutni korisnik ne može biti onemogućen
 downgradeCurrentUserLongMessage=Nije moguće vratiti unazad ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan.
 userAlreadyExistsOAuthMessage=Korisnik već postoji kao OAuth2 korisnik.
 userAlreadyExistsWebMessage=Korisnik već postoji kao web korisnik.
+invalidRoleMessage=Invalid role.
 error=Greška
 oops=Ups!
 help=Pomoć
diff --git a/stirling-pdf/src/main/resources/messages_hu_HU.properties b/stirling-pdf/src/main/resources/messages_hu_HU.properties
index 8dc4a0433..560921180 100644
--- a/stirling-pdf/src/main/resources/messages_hu_HU.properties
+++ b/stirling-pdf/src/main/resources/messages_hu_HU.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=A jelenlegi felhasználó nem tiltható le
 downgradeCurrentUserLongMessage=A jelenlegi felhasználó jogosultsági szintje nem csökkenthető. Ezért a jelenlegi felhasználó nem jelenik meg.
 userAlreadyExistsOAuthMessage=A felhasználó már létezik OAuth2 felhasználóként.
 userAlreadyExistsWebMessage=A felhasználó már létezik webes felhasználóként.
+invalidRoleMessage=Invalid role.
 error=Hiba
 oops=Hoppá!
 help=Súgó
@@ -220,12 +221,12 @@ addToDoc=Hozzáadás a dokumentumhoz
 reset=Visszaállítás
 apply=Alkalmaz
 noFileSelected=Nincs fájl kiválasztva. Kérjük, töltsön fel egyet.
-view=View
-cancel=Cancel
+view=Megtekintés
+cancel=Mégse
 
-back.toSettings=Back to Settings
-back.toHome=Back to Home
-back.toAdmin=Back to Admin
+back.toSettings=Vissza a Beállításokhoz
+back.toHome=Vissza a Kezdőlapra
+back.toAdmin=Vissza a Rendszergazdai beállításokhoz
 
 legal.privacy=Adatvédelmi irányelvek
 legal.terms=Felhasználási feltételek
@@ -393,13 +394,13 @@ adminUserSettings.teamHidden=Hidden
 adminUserSettings.totalMembers=Összes tag
 adminUserSettings.confirmDeleteTeam=Biztosan törli ezt a csapatot?
 
-teamCreated=Team created successfully
-teamExists=A team with that name already exists
-teamNameExists=Another team with that name already exists
-teamNotFound=Team not found
-teamDeleted=Team deleted
-teamHasUsers=Cannot delete a team with users assigned
-teamRenamed=Team renamed successfully
+teamCreated=Csapat sikeresen létrehozva
+teamExists=A csapat már létezik
+teamNameExists=A csapat neve már létezik
+teamNotFound=Csapat nem található
+teamDeleted=Csapat törölve
+teamHasUsers=Nem lehet törölni egy olyan csapatot, amelyhez felhasználók vannak rendelve
+teamRenamed=Csapat sikeresen átnevezve
 
 # Team user management
 team.addUser=Felhasználó hozzáadása a csapathoz
@@ -411,16 +412,16 @@ team.back=Vissza a csapatokhoz
 team.internal=Belső csapat
 team.internalTeamNotAccessible=A belső csapat egy rendszer csapat, és nem érhető el
 team.cannotMoveInternalUsers=A belső csapatban lévő felhasználók nem mozgathatók más csapatokba.
-team.hidden=Hidden
-team.name=Team Name
-team.totalMembers=Total Members
-team.members=Members
-team.username=Username
-team.role=Role
-team.status=Status
-team.enabled=Enabled
-team.disabled=Disabled
-team.noMembers=This team has no members yet.
+team.hidden=Rejtett csapat
+team.name=Csapat neve
+team.totalMembers=Összes tag
+team.members=Tagok
+team.username=Felhasználónév
+team.role=Szerepkör
+team.status=Állapot
+team.enabled=Engedélyezve
+team.disabled=Letiltva
+team.noMembers=Ez a csapat még nem rendelkezik tagokkal.
 
 
 
diff --git a/stirling-pdf/src/main/resources/messages_id_ID.properties b/stirling-pdf/src/main/resources/messages_id_ID.properties
index e67ec9ca1..ec391ce3d 100644
--- a/stirling-pdf/src/main/resources/messages_id_ID.properties
+++ b/stirling-pdf/src/main/resources/messages_id_ID.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Pengguna saat ini tidak dapat dinonaktifkan
 downgradeCurrentUserLongMessage=Tidak dapat menurunkan peran pengguna saat ini. Oleh karena itu, pengguna saat ini tidak akan ditampilkan.
 userAlreadyExistsOAuthMessage=Pengguna sudah ada sebagai pengguna OAuth2.
 userAlreadyExistsWebMessage=Pengguna sudah ada sebagai pengguna web.
+invalidRoleMessage=Invalid role.
 error=Kesalahan
 oops=Ups!
 help=Bantuan
diff --git a/stirling-pdf/src/main/resources/messages_it_IT.properties b/stirling-pdf/src/main/resources/messages_it_IT.properties
index c632cc3cd..70e00b2d2 100644
--- a/stirling-pdf/src/main/resources/messages_it_IT.properties
+++ b/stirling-pdf/src/main/resources/messages_it_IT.properties
@@ -6,132 +6,132 @@ language.direction=ltr
 
 # Language names for reuse throughout the application
 lang.afr=Afrikaans
-lang.amh=Amharic
-lang.ara=Arabic
+lang.amh=Amarico
+lang.ara=Arabo
 lang.asm=Assamese
-lang.aze=Azerbaijani
-lang.aze_cyrl=Azerbaijani (Cyrillic)
-lang.bel=Belarusian
+lang.aze=Azerbaigiano
+lang.aze_cyrl=Azerbaigiano (Cirillico)
+lang.bel=Bielorusso
 lang.ben=Bengali
-lang.bod=Tibetan
-lang.bos=Bosnian
-lang.bre=Breton
-lang.bul=Bulgarian
-lang.cat=Catalan
+lang.bod=Tibetano
+lang.bos=Bosniaco
+lang.bre=Bretone
+lang.bul=Bulgaro
+lang.cat=Catalano
 lang.ceb=Cebuano
-lang.ces=Czech
-lang.chi_sim=Chinese (Simplified)
-lang.chi_sim_vert=Chinese (Simplified, Vertical)
-lang.chi_tra=Chinese (Traditional)
-lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.ces=Ceco
+lang.chi_sim=Cinese (Semplificato)
+lang.chi_sim_vert=Cinese (Semplificato, Verticale)
+lang.chi_tra=Cinese (Tradizionale)
+lang.chi_tra_vert=Cinese (Tradizionale, Verticale)
 lang.chr=Cherokee
-lang.cos=Corsican
-lang.cym=Welsh
-lang.dan=Danish
-lang.dan_frak=Danish (Fraktur)
-lang.deu=German
-lang.deu_frak=German (Fraktur)
+lang.cos=Corso
+lang.cym=Gallese
+lang.dan=Danese
+lang.dan_frak=Danese (Fraktur)
+lang.deu=Tedesco
+lang.deu_frak=Tedesco (Fraktur)
 lang.div=Divehi
 lang.dzo=Dzongkha
-lang.ell=Greek
-lang.eng=English
-lang.enm=English, Middle (1100-1500)
+lang.ell=Greco
+lang.eng=Inglese
+lang.enm=Inglese Medio (1100-1500)
 lang.epo=Esperanto
-lang.equ=Math / equation detection module
-lang.est=Estonian
-lang.eus=Basque
+lang.equ=Modulo di rilevamento matematico/equazioni
+lang.est=Estone
+lang.eus=Basco
 lang.fao=Faroese
-lang.fas=Persian
-lang.fil=Filipino
-lang.fin=Finnish
-lang.fra=French
-lang.frk=Frankish
-lang.frm=French, Middle (ca.1400-1600)
-lang.fry=Western Frisian
-lang.gla=Scottish Gaelic
-lang.gle=Irish
-lang.glg=Galician
-lang.grc=Ancient Greek
+lang.fas=Persiano
+lang.fil=Filippino
+lang.fin=Finlandese
+lang.fra=Francese
+lang.frk=Franco
+lang.frm=Francese Medio (ca.1400-1600)
+lang.fry=Frisone Occidentale
+lang.gla=Gaelico Scozzese
+lang.gle=Irlandese
+lang.glg=Galiziano
+lang.grc=Greco Antico
 lang.guj=Gujarati
-lang.hat=Haitian, Haitian Creole
-lang.heb=Hebrew
+lang.hat=Haitiano, Creolo Haitiano
+lang.heb=Ebraico
 lang.hin=Hindi
-lang.hrv=Croatian
-lang.hun=Hungarian
-lang.hye=Armenian
+lang.hrv=Croato
+lang.hun=Ungherese
+lang.hye=Armeno
 lang.iku=Inuktitut
-lang.ind=Indonesian
-lang.isl=Icelandic
-lang.ita=Italian
-lang.ita_old=Italian (Old)
-lang.jav=Javanese
-lang.jpn=Japanese
-lang.jpn_vert=Japanese (Vertical)
+lang.ind=Indonesiano
+lang.isl=Islandese
+lang.ita=Italiano
+lang.ita_old=Italiano (Antico)
+lang.jav=Giavanese
+lang.jpn=Giapponese
+lang.jpn_vert=Giapponese (Verticale)
 lang.kan=Kannada
-lang.kat=Georgian
-lang.kat_old=Georgian (Old)
-lang.kaz=Kazakh
-lang.khm=Central Khmer
-lang.kir=Kirghiz, Kyrgyz
-lang.kmr=Northern Kurdish
-lang.kor=Korean
-lang.kor_vert=Korean (Vertical)
+lang.kat=Georgiano
+lang.kat_old=Georgiano (Antico)
+lang.kaz=Kazako
+lang.khm=Khmer Centrale
+lang.kir=Kirghiso, Kirgiz
+lang.kmr=Curdo Settentrionale
+lang.kor=Coreano
+lang.kor_vert=Coreano (Verticale)
 lang.lao=Lao
-lang.lat=Latin
-lang.lav=Latvian
-lang.lit=Lithuanian
-lang.ltz=Luxembourgish
+lang.lat=Latino
+lang.lav=Lettone
+lang.lit=Lituano
+lang.ltz=Lussemburghese
 lang.mal=Malayalam
 lang.mar=Marathi
-lang.mkd=Macedonian
+lang.mkd=Macedone
 lang.mlt=Maltese
-lang.mon=Mongolian
+lang.mon=Mongolo
 lang.mri=Maori
-lang.msa=Malay
-lang.mya=Burmese
-lang.nep=Nepali
-lang.nld=Dutch; Flemish
-lang.nor=Norwegian
-lang.oci=Occitan (post 1500)
+lang.msa=Malese
+lang.mya=Birmano
+lang.nep=Nepalese
+lang.nld=Olandese; Fiammingo
+lang.nor=Norvegese
+lang.oci=Occitano (post 1500)
 lang.ori=Oriya
-lang.osd=Orientation and script detection module
+lang.osd=Modulo di rilevamento dell'orientamento e dello script
 lang.pan=Panjabi, Punjabi
-lang.pol=Polish
-lang.por=Portuguese
+lang.pol=Polacco
+lang.por=Portoghese
 lang.pus=Pushto, Pashto
 lang.que=Quechua
-lang.ron=Romanian, Moldavian, Moldovan
-lang.rus=Russian
-lang.san=Sanskrit
-lang.sin=Sinhala, Sinhalese
-lang.slk=Slovak
-lang.slk_frak=Slovak (Fraktur)
-lang.slv=Slovenian
+lang.ron=Rumeno, Moldavo, Moldavo
+lang.rus=Russo
+lang.san=Sanscrito
+lang.sin=Singalese
+lang.slk=Slovacco
+lang.slk_frak=Slovacco (Fraktur)
+lang.slv=Sloveno
 lang.snd=Sindhi
-lang.spa=Spanish
-lang.spa_old=Spanish (Old)
-lang.sqi=Albanian
-lang.srp=Serbian
-lang.srp_latn=Serbian (Latin)
+lang.spa=Spagnolo
+lang.spa_old=Spagnolo (Antico)
+lang.sqi=Albanese
+lang.srp=Serbo
+lang.srp_latn=Serbo (Latino)
 lang.sun=Sundanese
 lang.swa=Swahili
-lang.swe=Swedish
-lang.syr=Syriac
+lang.swe=Svedese
+lang.syr=Siriano
 lang.tam=Tamil
-lang.tat=Tatar
+lang.tat=Tartaro
 lang.tel=Telugu
-lang.tgk=Tajik
+lang.tgk=Tagiko
 lang.tgl=Tagalog
-lang.tha=Thai
-lang.tir=Tigrinya
-lang.ton=Tonga (Tonga Islands)
-lang.tur=Turkish
-lang.uig=Uighur, Uyghur
-lang.ukr=Ukrainian
+lang.tha=Thailandese
+lang.tir=Tigrino
+lang.ton=Tonga (Isole Tonga)
+lang.tur=Turco
+lang.uig=Uiguro, Uyghur
+lang.ukr=Ucraino
 lang.urd=Urdu
-lang.uzb=Uzbek
-lang.uzb_cyrl=Uzbek (Cyrillic)
-lang.vie=Vietnamese
+lang.uzb=Uzbeko
+lang.uzb_cyrl=Uzbeko (Cirillico)
+lang.vie=Vietnamita
 lang.yid=Yiddish
 lang.yor=Yoruba
 
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=L'utente corrente non può essere disabilitato
 downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
 userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
 userAlreadyExistsWebMessage=L'utente esiste già come utente web.
+invalidRoleMessage=Invalid role.
 error=Errore
 oops=Oops!
 help=Aiuto
@@ -212,7 +213,7 @@ color=Colore
 sponsor=Sponsor
 info=Info
 pro=Pro
-proFeatures=Pro Features
+proFeatures=Funzionalità Pro
 page=Pagina
 pages=Pagine
 loading=Caricamento...
@@ -220,12 +221,12 @@ addToDoc=Aggiungi al documento
 reset=Resetta
 apply=Applica
 noFileSelected=Nessun file selezionato. Caricane uno.
-view=View
-cancel=Cancel
+view=Visualizzazione
+cancel=Annulla
 
-back.toSettings=Back to Settings
-back.toHome=Back to Home
-back.toAdmin=Back to Admin
+back.toSettings=Torna alle impostazioni
+back.toHome=Torna alla Home
+back.toAdmin=Torna all'amministratore
 
 legal.privacy=Informativa sulla privacy
 legal.terms=Termini e Condizioni
@@ -266,7 +267,7 @@ enterpriseEdition.button=Aggiorna alla versione Pro
 enterpriseEdition.warning=Questa funzionalità è disponibile solo per gli utenti Pro.
 enterpriseEdition.yamlAdvert=Stirling PDF Pro supporta i file di configurazione YAML e altre funzionalità SSO.
 enterpriseEdition.ssoAdvert=Cerchi altre funzionalità di gestione degli utenti? Dai un'occhiata a Stirling PDF Pro
-enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro licence or higher
+enterpriseEdition.proTeamFeatureDisabled=Le funzionalità di gestione del team richiedono una licenza Pro o superiore
 
 
 #################
@@ -347,8 +348,8 @@ account.property=Proprietà
 account.webBrowserSettings=Impostazione del browser web
 account.syncToBrowser=Sincronizza account -> Browser
 account.syncToAccount=Sincronizza account <- Browser
-account.adminTitle=Administrator Tools
-account.adminNotif=You have admin privileges. Access system settings and user management.
+account.adminTitle=Strumenti di amministrazione
+account.adminNotif=Hai privilegi di amministratore. Accedi alle impostazioni di sistema e alla gestione degli utenti.
 
 
 adminUserSettings.title=Impostazioni di controllo utente
@@ -379,48 +380,48 @@ adminUserSettings.disabledUsers=Utenti disabili:
 adminUserSettings.totalUsers=Utenti totali:
 adminUserSettings.lastRequest=Ultima richiesta
 adminUserSettings.usage=Visualizza utilizzo
-adminUserSettings.teams=View/Edit Teams
+adminUserSettings.teams=Visualizza/modifica Team
 adminUserSettings.team=Team
-adminUserSettings.manageTeams=Manage Teams
-adminUserSettings.createTeam=Create Team
-adminUserSettings.viewTeam=View Team
-adminUserSettings.deleteTeam=Delete Team
-adminUserSettings.teamName=Team Name
-adminUserSettings.teamExists=Team already exists
-adminUserSettings.teamCreated=Team created successfully
-adminUserSettings.teamChanged=User's team was updated
-adminUserSettings.teamHidden=Hidden
-adminUserSettings.totalMembers=Total Members
-adminUserSettings.confirmDeleteTeam=Are you sure you want to delete this team?
+adminUserSettings.manageTeams=Gestire i team
+adminUserSettings.createTeam=Crea Team
+adminUserSettings.viewTeam=Visualizza Team
+adminUserSettings.deleteTeam=Elimina Team
+adminUserSettings.teamName=Nome del Team
+adminUserSettings.teamExists=Il Team esiste già
+adminUserSettings.teamCreated=Team creato con successo
+adminUserSettings.teamChanged=Il team dell'utente è stato aggiornato
+adminUserSettings.teamHidden=Nascosto
+adminUserSettings.totalMembers=Totale membri
+adminUserSettings.confirmDeleteTeam=Sei sicuro di voler eliminare questa Team?
 
-teamCreated=Team created successfully
-teamExists=A team with that name already exists
-teamNameExists=Another team with that name already exists
-teamNotFound=Team not found
-teamDeleted=Team deleted
-teamHasUsers=Cannot delete a team with users assigned
-teamRenamed=Team renamed successfully
+teamCreated=Team creato con successo
+teamExists=Esiste già un Team con quel nome
+teamNameExists=Esiste già un'altro Team con quel nome
+teamNotFound=Team non trovato
+teamDeleted=Team cancellato
+teamHasUsers=Non è possibile eliminare un Team con utenti assegnati
+teamRenamed=Team rinominato con successo
 
 # Team user management
-team.addUser=Add User to Team
-team.selectUser=Select User
-team.warning.moveUser=Warning: This will move the user from "{0}" team to "{1}" team. Are you sure?
-team.confirm.moveUser=Are you sure you want to move this user from "{0}" team to "{1}" team?
-team.userAdded=User successfully added to team
-team.back=Back to Teams
-team.internal=Internal Team
-team.internalTeamNotAccessible=The Internal team is a system team and cannot be accessed
-team.cannotMoveInternalUsers=Users in the Internal team cannot be moved to other teams
-team.hidden=Hidden
-team.name=Team Name
-team.totalMembers=Total Members
-team.members=Members
-team.username=Username
-team.role=Role
-team.status=Status
-team.enabled=Enabled
-team.disabled=Disabled
-team.noMembers=This team has no members yet.
+team.addUser=Aggiungere Utente al Team
+team.selectUser=Seleziona Utente
+team.warning.moveUser=Attenzione: Questa azione sposterà l'utente dal Team "{0}" al Team "{1}". Sei sicuro?
+team.confirm.moveUser=Sei sicuro di voler spostare questo utente dal Team "{0}" al Team "{1}"?
+team.userAdded=Utente aggiunto con successo al Team
+team.back=Torna ai Team
+team.internal=Team Interno
+team.internalTeamNotAccessible=Il Team interno è un Team di sistema e non è accessibile
+team.cannotMoveInternalUsers=Gli utenti nel Team interno non possono essere spostati in altri Team
+team.hidden=Nascosto
+team.name=Nome Team
+team.totalMembers=Membri Totali
+team.members=Membri
+team.username=Nome Utente
+team.role=Ruolo
+team.status=Stato
+team.enabled=Abilitato
+team.disabled=Disabilitato
+team.noMembers=Questo Team non ha ancora membri.
 
 
 
@@ -1211,7 +1212,7 @@ merge.header=Unisci 2 o più PDF
 merge.sortByName=Ordina per nome
 merge.sortByDate=Ordina per data
 merge.removeCertSign=Rimuovere la firma digitale nel file unito?
-merge.generateToc=Generate table of contents in the merged file?
+merge.generateToc=Generare un indice nel file unito?
 merge.submit=Unisci
 
 
@@ -1699,17 +1700,17 @@ fakeScan.resolution=Risoluzione (DPI)
 
 
 # Table of Contents Feature
-home.editTableOfContents.title=Edit Table of Contents
-home.editTableOfContents.desc=Add or edit bookmarks and table of contents in PDF documents
+home.editTableOfContents.title=Modifica indice
+home.editTableOfContents.desc=Aggiungi o modifica segnalibri e sommario nei documenti PDF
 
-editTableOfContents.tags=bookmarks,toc,navigation,index,table of contents,chapters,sections,outline
-editTableOfContents.title=Edit Table of Contents
-editTableOfContents.header=Add or Edit PDF Table of Contents
-editTableOfContents.replaceExisting=Replace existing bookmarks (uncheck to append to existing)
-editTableOfContents.editorTitle=Bookmark Editor
-editTableOfContents.editorDesc=Add and arrange bookmarks below. Click + to add child bookmarks.
-editTableOfContents.addBookmark=Add New Bookmark
-editTableOfContents.desc.1=This tool allows you to add or edit the table of contents (bookmarks) in a PDF document.
-editTableOfContents.desc.2=You can create a hierarchical structure by adding child bookmarks to parent bookmarks.
-editTableOfContents.desc.3=Each bookmark requires a title and target page number.
-editTableOfContents.submit=Apply Table of Contents
+editTableOfContents.tags=segnalibri, indice, navigazione, indice analitico, sommario, capitoli, sezioni, struttura
+editTableOfContents.title=Modifica indice
+editTableOfContents.header=Aggiungi o modifica sommario PDF
+editTableOfContents.replaceExisting=Sostituisci i segnalibri esistenti (deseleziona per aggiungerli a quelli esistenti)
+editTableOfContents.editorTitle=Editor segnalibri
+editTableOfContents.editorDesc=Aggiungi e disponi i segnalibri qui sotto. Fai clic su + per aggiungere segnalibri secondari.
+editTableOfContents.addBookmark=Aggiungi nuovo segnalibro
+editTableOfContents.desc.1=Questo strumento consente di aggiungere o modificare il sommario (segnalibri) in un documento PDF.
+editTableOfContents.desc.2=È possibile creare una struttura gerarchica aggiungendo segnalibri secondari a quelli principali.
+editTableOfContents.desc.3=Ogni segnalibro richiede un titolo e un numero di pagina di destinazione.
+editTableOfContents.submit=Applica sommario
diff --git a/stirling-pdf/src/main/resources/messages_ja_JP.properties b/stirling-pdf/src/main/resources/messages_ja_JP.properties
index d5578a084..6881ab36d 100644
--- a/stirling-pdf/src/main/resources/messages_ja_JP.properties
+++ b/stirling-pdf/src/main/resources/messages_ja_JP.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=現在のユーザーを無効にすることはで
 downgradeCurrentUserLongMessage=現在のユーザーの役割をダウングレードできません。したがって、現在のユーザーは表示されません。
 userAlreadyExistsOAuthMessage=ユーザーは既にOAuth2ユーザーとして存在します。
 userAlreadyExistsWebMessage=ユーザーは既にWebユーザーとして存在します。
+invalidRoleMessage=Invalid role.
 error=エラー
 oops=おっと！
 help=ヘルプ
diff --git a/stirling-pdf/src/main/resources/messages_ko_KR.properties b/stirling-pdf/src/main/resources/messages_ko_KR.properties
index 7e4b2396a..6658f175e 100644
--- a/stirling-pdf/src/main/resources/messages_ko_KR.properties
+++ b/stirling-pdf/src/main/resources/messages_ko_KR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=현재 사용자를 비활성화할 수 없습니다
 downgradeCurrentUserLongMessage=현재 사용자의 역할을 강등할 수 없습니다. 따라서 현재 사용자는 표시되지 않습니다.
 userAlreadyExistsOAuthMessage=해당 사용자는 이미 OAuth2 사용자로 존재합니다.
 userAlreadyExistsWebMessage=해당 사용자는 이미 웹 사용자로 존재합니다.
+invalidRoleMessage=Invalid role.
 error=오류
 oops=이런!
 help=도움말
diff --git a/stirling-pdf/src/main/resources/messages_ml_IN.properties b/stirling-pdf/src/main/resources/messages_ml_IN.properties
index affa86c17..4f79755c9 100644
--- a/stirling-pdf/src/main/resources/messages_ml_IN.properties
+++ b/stirling-pdf/src/main/resources/messages_ml_IN.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=നിലവിലെ ഉപയോക്താവി
 downgradeCurrentUserLongMessage=നിലവിലെ ഉപയോക്താവിന്റെ റോൾ താഴ്ത്താൻ കഴിയില്ല. അതിനാൽ, നിലവിലെ ഉപയോക്താവിനെ കാണിക്കില്ല.
 userAlreadyExistsOAuthMessage=ഈ ഉപയോക്താവ് ഇതിനകം ഒരു OAuth2 ഉപയോക്താവായി നിലവിലുണ്ട്.
 userAlreadyExistsWebMessage=ഈ ഉപയോക്താവ് ഇതിനകം ഒരു വെബ് ഉപയോക്താവായി നിലവിലുണ്ട്.
+invalidRoleMessage=Invalid role.
 error=പിശക്
 oops=അയ്യോ!
 help=സഹായം
diff --git a/stirling-pdf/src/main/resources/messages_nl_NL.properties b/stirling-pdf/src/main/resources/messages_nl_NL.properties
index c6d9b7559..c34c8f74b 100644
--- a/stirling-pdf/src/main/resources/messages_nl_NL.properties
+++ b/stirling-pdf/src/main/resources/messages_nl_NL.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=De huidige gebruiker kan niet worden uitgeschakeld
 downgradeCurrentUserLongMessage=Kan de rol van de huidige gebruiker niet downgraden. Huidige gebruiker wordt dus niet weergegeven.
 userAlreadyExistsOAuthMessage=De gebruiker bestaat al als een OAuth2 gebruiker.
 userAlreadyExistsWebMessage=De gebruiker bestaat al als een web gebruiker.
+invalidRoleMessage=Invalid role.
 error=Fout
 oops=Oeps!
 help=Hulp
diff --git a/stirling-pdf/src/main/resources/messages_no_NB.properties b/stirling-pdf/src/main/resources/messages_no_NB.properties
index 674b7a3b4..0fdf5a2dd 100644
--- a/stirling-pdf/src/main/resources/messages_no_NB.properties
+++ b/stirling-pdf/src/main/resources/messages_no_NB.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Den pålogga brukeren kan ikke deaktiveres.
 downgradeCurrentUserLongMessage=Kan ikke nedgradere den innloggede brukerens rolle. Derfor vil ikke den innloggede brukeren bli vist.
 userAlreadyExistsOAuthMessage=Brukeren eksisterer allerede som en OAuth2-bruker.
 userAlreadyExistsWebMessage=Brukeren eksisterer allerede som en web-bruker.
+invalidRoleMessage=Invalid role.
 error=Feil
 oops=Oops!
 help=Hjelp
diff --git a/stirling-pdf/src/main/resources/messages_pl_PL.properties b/stirling-pdf/src/main/resources/messages_pl_PL.properties
index e3c870fe7..0955732ed 100644
--- a/stirling-pdf/src/main/resources/messages_pl_PL.properties
+++ b/stirling-pdf/src/main/resources/messages_pl_PL.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Nie można wyłączyć bieżącego użytkownika
 downgradeCurrentUserLongMessage=Nie można obniżyć roli bieżącego użytkownika. W związku z tym bieżący użytkownik nie zostanie wyświetlony.
 userAlreadyExistsOAuthMessage=Takie konto użytkownika istnieje - stworzone za pomocą OAuth2.
 userAlreadyExistsWebMessage=Takie konto użytkownika istnieje - stworzone za pomocą przeglądarki.
+invalidRoleMessage=Invalid role.
 error=błąd
 oops=Ups!
 help=Pomoc
diff --git a/stirling-pdf/src/main/resources/messages_pt_BR.properties b/stirling-pdf/src/main/resources/messages_pt_BR.properties
index 479dd12df..a9ee020e8 100644
--- a/stirling-pdf/src/main/resources/messages_pt_BR.properties
+++ b/stirling-pdf/src/main/resources/messages_pt_BR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=O usuário atual não pode ser desativado.
 downgradeCurrentUserLongMessage=Não é possível fazer downgrade da função do usuário atual. Portanto, o usuário atual não será mostrado.
 userAlreadyExistsOAuthMessage=O usuário já existe como um usuário OAuth2.
 userAlreadyExistsWebMessage=O usuário já existe como um usuário Web.
+invalidRoleMessage=Invalid role.
 error=Erro
 oops=Ops!
 help=Ajuda
diff --git a/stirling-pdf/src/main/resources/messages_pt_PT.properties b/stirling-pdf/src/main/resources/messages_pt_PT.properties
index decb7890f..1156df651 100644
--- a/stirling-pdf/src/main/resources/messages_pt_PT.properties
+++ b/stirling-pdf/src/main/resources/messages_pt_PT.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=O utilizador atual não pode ser desativado
 downgradeCurrentUserLongMessage=Não é possível rebaixar a função do utilizador atual. Por isso, o utilizador atual não será mostrado.
 userAlreadyExistsOAuthMessage=O utilizador já existe como utilizador OAuth2.
 userAlreadyExistsWebMessage=O utilizador já existe como utilizador web.
+invalidRoleMessage=Invalid role.
 error=Erro
 oops=Ups!
 help=Ajuda
diff --git a/stirling-pdf/src/main/resources/messages_ro_RO.properties b/stirling-pdf/src/main/resources/messages_ro_RO.properties
index fd1b2b2b0..07bf394b0 100644
--- a/stirling-pdf/src/main/resources/messages_ro_RO.properties
+++ b/stirling-pdf/src/main/resources/messages_ro_RO.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Utilizatorul curent nu poate fi dezactivat
 downgradeCurrentUserLongMessage=Rolul utilizatorului curent nu poate fi retrogradat. Prin urmare, utilizatorul curent nu va fi afișat.
 userAlreadyExistsOAuthMessage=Utilizatorul există deja ca utilizator OAuth2.
 userAlreadyExistsWebMessage=Utilizatorul există deja ca utilizator web.
+invalidRoleMessage=Invalid role.
 error=Eroare
 oops=Ups!
 help=Ajutor
diff --git a/stirling-pdf/src/main/resources/messages_ru_RU.properties b/stirling-pdf/src/main/resources/messages_ru_RU.properties
index 9f2b12b95..a5aa2938f 100644
--- a/stirling-pdf/src/main/resources/messages_ru_RU.properties
+++ b/stirling-pdf/src/main/resources/messages_ru_RU.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Текущий пользователь не може
 downgradeCurrentUserLongMessage=Невозможно понизить роль текущего пользователя. Следовательно, текущий пользователь не будет отображаться.
 userAlreadyExistsOAuthMessage=Пользователь уже существует как пользователь OAuth2.
 userAlreadyExistsWebMessage=Пользователь уже существует как веб-пользователь.
+invalidRoleMessage=Invalid role.
 error=Ошибка
 oops=Упс!
 help=Помощь
diff --git a/stirling-pdf/src/main/resources/messages_sk_SK.properties b/stirling-pdf/src/main/resources/messages_sk_SK.properties
index 38854b54d..874d0454d 100644
--- a/stirling-pdf/src/main/resources/messages_sk_SK.properties
+++ b/stirling-pdf/src/main/resources/messages_sk_SK.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nie je možné znížiť rolu aktuálneho používateľa. Preto, aktuálny používateľ nebude zobrazený.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
+invalidRoleMessage=Invalid role.
 error=Chyba
 oops=Ups!
 help=Pomoc
diff --git a/stirling-pdf/src/main/resources/messages_sl_SI.properties b/stirling-pdf/src/main/resources/messages_sl_SI.properties
index 82f4b6c5a..36a1d54bd 100644
--- a/stirling-pdf/src/main/resources/messages_sl_SI.properties
+++ b/stirling-pdf/src/main/resources/messages_sl_SI.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Trenutnega uporabnika ni mogoče onemogočiti
 downgradeCurrentUserLongMessage=Vloge trenutnega uporabnika ni mogoče znižati. Zato trenutni uporabnik ne bo prikazan.
 userAlreadyExistsOAuthMessage=Uporabnik že obstaja kot uporabnik OAuth2.
 userAlreadyExistsWebMessage=Uporabnik že obstaja kot spletni uporabnik.
+invalidRoleMessage=Invalid role.
 error=Napaka
 oops=Ojoj!
 help=Pomoč
diff --git a/stirling-pdf/src/main/resources/messages_sr_LATN_RS.properties b/stirling-pdf/src/main/resources/messages_sr_LATN_RS.properties
index 7de2ae361..669c25db8 100644
--- a/stirling-pdf/src/main/resources/messages_sr_LATN_RS.properties
+++ b/stirling-pdf/src/main/resources/messages_sr_LATN_RS.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Nije moguće unazaditi ulogu trenutnog korisnika. Dakle, trenutni korisnik neće biti prikazan.
 userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
 userAlreadyExistsWebMessage=The user already exists as an web user.
+invalidRoleMessage=Invalid role.
 error=Error
 oops=Oops!
 help=Help
diff --git a/stirling-pdf/src/main/resources/messages_sv_SE.properties b/stirling-pdf/src/main/resources/messages_sv_SE.properties
index c3cd30f58..41385f394 100644
--- a/stirling-pdf/src/main/resources/messages_sv_SE.properties
+++ b/stirling-pdf/src/main/resources/messages_sv_SE.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Den nuvarande användaren kan inte inaktiveras
 downgradeCurrentUserLongMessage=Kan inte nedgradera nuvarande användares roll. Därför kommer den aktuella användaren inte att visas.
 userAlreadyExistsOAuthMessage=Användaren finns redan som en OAuth2-användare.
 userAlreadyExistsWebMessage=Användaren finns redan som en webbanvändare.
+invalidRoleMessage=Invalid role.
 error=Fel
 oops=Hoppsan!
 help=Hjälp
diff --git a/stirling-pdf/src/main/resources/messages_th_TH.properties b/stirling-pdf/src/main/resources/messages_th_TH.properties
index cecd59d26..9919f4a7b 100644
--- a/stirling-pdf/src/main/resources/messages_th_TH.properties
+++ b/stirling-pdf/src/main/resources/messages_th_TH.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=ผู้ใช้งานปัจจุบัน
 downgradeCurrentUserLongMessage=ไม่สามารถลดระดับบทบาทของผู้ใช้ปัจจุบันได้ ดังนั้นผู้ใช้ปัจจุบันจะไม่ปรากฏ
 userAlreadyExistsOAuthMessage=ผู้ใช้มีอยู่แล้วในฐานะผู้ใช้ OAuth2
 userAlreadyExistsWebMessage=ผู้ใช้มีอยู่แล้วในฐานะผู้ใช้เว็บ
+invalidRoleMessage=Invalid role.
 error=ข้อผิดพลาด
 oops=อุ๊ย!
 help=ช่วยเหลือ
diff --git a/stirling-pdf/src/main/resources/messages_tr_TR.properties b/stirling-pdf/src/main/resources/messages_tr_TR.properties
index 776966c83..4fe3f172a 100644
--- a/stirling-pdf/src/main/resources/messages_tr_TR.properties
+++ b/stirling-pdf/src/main/resources/messages_tr_TR.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Mevcut kullanıcı devre dışı bırakılamaz
 downgradeCurrentUserLongMessage=Mevcut kullanıcının rolü düşürülemiyor. Bu nedenle, mevcut kullanıcı gösterilmeyecektir.
 userAlreadyExistsOAuthMessage=Kullanıcı zaten bir OAuth2 kullanıcısı olarak mevcut.
 userAlreadyExistsWebMessage=Kullanıcı zaten bir web kullanıcısı olarak mevcut.
+invalidRoleMessage=Invalid role.
 error=Hata
 oops=Tüh!
 help=Yardım
diff --git a/stirling-pdf/src/main/resources/messages_uk_UA.properties b/stirling-pdf/src/main/resources/messages_uk_UA.properties
index c63d6b8a1..8b33867b3 100644
--- a/stirling-pdf/src/main/resources/messages_uk_UA.properties
+++ b/stirling-pdf/src/main/resources/messages_uk_UA.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=Поточного користувача немож
 downgradeCurrentUserLongMessage=Неможливо понизити роль поточного користувача. Отже, поточний користувач не відображатиметься.
 userAlreadyExistsOAuthMessage=Користувач уже існує як користувач OAuth2.
 userAlreadyExistsWebMessage=Користувач уже існує як веб-користувач.
+invalidRoleMessage=Invalid role.
 error=Помилка
 oops=Упс!
 help=Допомога
diff --git a/stirling-pdf/src/main/resources/messages_vi_VN.properties b/stirling-pdf/src/main/resources/messages_vi_VN.properties
index 76b56ddb6..c03b4c346 100644
--- a/stirling-pdf/src/main/resources/messages_vi_VN.properties
+++ b/stirling-pdf/src/main/resources/messages_vi_VN.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Không thể hạ cấp vai trò của người dùng hiện tại. Do đó, người dùng hiện tại sẽ không được hiển thị.
 userAlreadyExistsOAuthMessage=Người dùng đã tồn tại dưới dạng người dùng OAuth2.
 userAlreadyExistsWebMessage=Người dùng đã tồn tại dưới dạng người dùng web.
+invalidRoleMessage=Invalid role.
 error=Lỗi
 oops=Rất tiếc!
 help=Trợ giúp
diff --git a/stirling-pdf/src/main/resources/messages_zh_CN.properties b/stirling-pdf/src/main/resources/messages_zh_CN.properties
index c8a9b55e4..89cc89f9b 100644
--- a/stirling-pdf/src/main/resources/messages_zh_CN.properties
+++ b/stirling-pdf/src/main/resources/messages_zh_CN.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=无法禁用当前用户。
 downgradeCurrentUserLongMessage=无法降级当前用户的角色。因此，当前用户将不会显示。
 userAlreadyExistsOAuthMessage=该用户已作为 OAuth2 用户存在。
 userAlreadyExistsWebMessage=该用户已作为 Web 用户存在。
+invalidRoleMessage=Invalid role.
 error=错误
 oops=哎呀！
 help=帮助
diff --git a/stirling-pdf/src/main/resources/messages_zh_TW.properties b/stirling-pdf/src/main/resources/messages_zh_TW.properties
index 3e861c9fb..4f18d9fe3 100644
--- a/stirling-pdf/src/main/resources/messages_zh_TW.properties
+++ b/stirling-pdf/src/main/resources/messages_zh_TW.properties
@@ -200,6 +200,7 @@ disabledCurrentUserMessage=無法停用目前使用者
 downgradeCurrentUserLongMessage=無法降級目前使用者的角色。因此，將不會顯示目前使用者。
 userAlreadyExistsOAuthMessage=使用者已經以 OAuth2 使用者身份存在。
 userAlreadyExistsWebMessage=使用者已經以網頁使用者身份存在。
+invalidRoleMessage=Invalid role.
 error=錯誤
 oops=哎呀！
 help=說明
@@ -675,7 +676,7 @@ home.HTMLToPDF.desc=將任何 HTML 檔案或壓縮檔轉換為 PDF
 HTMLToPDF.tags=標記,網頁內容,轉換,轉檔
 
 #eml-to-pdf
-home.EMLToPDF.title=Email to PDF
+home.EMLToPDF.title=電子郵件轉 PDF
 home.EMLToPDF.desc=將電子郵件 (EML) 檔案轉換為 PDF 格式，包含標頭、內文及內嵌圖片
 EMLToPDF.tags=電子郵件,轉換,EML,訊息,轉檔,轉換,郵件
 
diff --git a/stirling-pdf/src/main/resources/templates/adminSettings.html b/stirling-pdf/src/main/resources/templates/adminSettings.html
index 30c228490..1f97ff562 100644
--- a/stirling-pdf/src/main/resources/templates/adminSettings.html
+++ b/stirling-pdf/src/main/resources/templates/adminSettings.html
@@ -93,8 +93,8 @@
                   <span class="material-symbols-rounded">person_add</span>
                   <span th:text="#{adminUserSettings.addUser}">Add New User</span>
                 </button>
-                
-                <a href="/teams" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.teams}">
+
+                <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>
@@ -108,7 +108,7 @@
                   <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
                 </button>
                 
-                <a href="/usage" th:if="${@runningEE}" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.usage}">
+                <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>
@@ -125,27 +125,27 @@
                   <thead>
                     <tr>
                       <th scope="col">#</th>
-                      <th scope="col" th:title="#{username}" th:text="#{username}">Username</th>
-                      <th scope="col" th:title="#{adminUserSettings.team}" th:text="#{adminUserSettings.team}">Team</th>
-                      <th scope="col" th:title="#{adminUserSettings.role}" th:text="#{adminUserSettings.role}">Roles</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}" th:text="#{adminUserSettings.actions}">Actions</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}"></td>
-                      <td th:text="${user.username}" th:classappend="${userSessions[user.username] ? 'active-user' : ''}"></td>
-                      <td th:text="${user.team != null ? user.team.name : '—'}"></td>
+                      <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}}">Role</span>
+                          <span th:text="#{${user.roleName}}" th:title="#{${user.roleName}}" class="text-overflow">Role</span>
                         </span>
                       </td>
-                      <td th:text="${user.authenticationType}"></td>
-                      <td th:text="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}"></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;">
diff --git a/stirling-pdf/src/main/resources/templates/convert/eml-to-pdf.html b/stirling-pdf/src/main/resources/templates/convert/eml-to-pdf.html
index 2f1eb3ba3..e3b469ab9 100644
--- a/stirling-pdf/src/main/resources/templates/convert/eml-to-pdf.html
+++ b/stirling-pdf/src/main/resources/templates/convert/eml-to-pdf.html
@@ -7,62 +7,64 @@
 </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="container py-4">
+      <div class="mt-4"></div>
+      <div class="container">
         <div class="row justify-content-center">
-          <div class="col-md-6">
-            <div class="card shadow-sm">
-              <div class="card-body">
-                <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>
-                <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 type="checkbox" class="form-check-input" name="downloadHtml" id="downloadHtml">
-                    <label class="form-check-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 type="checkbox" class="form-check-input" name="includeAttachments" id="includeAttachments" checked>
-                      <label class="form-check-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>
-                  
-                  <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{EMLToPDF.submit}"></button>
-                </form>
-              </div>
+          <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 type="checkbox" class="form-check-input" name="downloadHtml" id="downloadHtml">
+                <label class="form-check-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 type="checkbox" class="form-check-input" name="includeAttachments" id="includeAttachments" checked>
+                  <label class="form-check-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>
@@ -75,11 +77,13 @@
       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 ? 'Download HTML' : '[[#{EMLToPDF.submit}]]';
+          submitBtn.textContent = downloadHtml.checked ? downloadHtmlText : submitText;
         }
       }
 
diff --git a/testing/cucumber/requirements.txt b/testing/cucumber/requirements.txt
index 87546aea1..bd74ed73f 100644
--- a/testing/cucumber/requirements.txt
+++ b/testing/cucumber/requirements.txt
@@ -7,7 +7,7 @@
 behave==1.2.6 \
     --hash=sha256:b9662327aa53294c1351b0a9c369093ccec1d21026f050c3bd9b3e5cccf81a86 \
     --hash=sha256:ebda1a6c9e5bfe95c5f9f0a2794e01c7098b3dde86c10a95d8621c5907ff6f1c
-    # via -r cucumber\requirements.in
+    # via -r requirements.in
 certifi==2024.12.14 \
     --hash=sha256:1275f7a45be9464efc1173084eaa30f866fe2e47d389406136d332ed4967ec56 \
     --hash=sha256:b650d30f370c2b724812bee08008be0c4163b163ddaec3f2546c1caf65f191db
@@ -230,19 +230,19 @@ pycryptodome==3.21.0 \
     --hash=sha256:f35e442630bc4bc2e1878482d6f59ea22e280d7121d7adeaedba58c23ab6386b \
     --hash=sha256:f7787e0d469bdae763b876174cf2e6c0f7be79808af26b1da96f1a64bcf47297 \
     --hash=sha256:ff99f952db3db2fbe98a0b355175f93ec334ba3d01bbde25ad3a5a33abc02b58
-    # via -r cucumber\requirements.in
+    # via -r requirements.in
 pypdf==5.1.0 \
     --hash=sha256:3bd4f503f4ebc58bae40d81e81a9176c400cbbac2ba2d877367595fb524dfdfc \
     --hash=sha256:425a129abb1614183fd1aca6982f650b47f8026867c0ce7c4b9f281c443d2740
-    # via -r cucumber\requirements.in
+    # via -r requirements.in
 reportlab==4.2.5 \
     --hash=sha256:5cf35b8fd609b68080ac7bbb0ae1e376104f7d5f7b2d3914c7adc63f2593941f \
     --hash=sha256:eb2745525a982d9880babb991619e97ac3f661fae30571b7d50387026ca765ee
-    # via -r cucumber\requirements.in
-requests==2.32.3 \
-    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
-    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
-    # via -r cucumber\requirements.in
+    # via -r requirements.in
+requests==2.32.4 \
+    --hash=sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c \
+    --hash=sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422
+    # via -r requirements.in
 six==1.17.0 \
     --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
     --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81