Merge pull request #327 from Frooodle/loginPage

Login page tweaks
language stuff
2023-08-28 10:19:23 +01:00 · 2023-08-28 10:17:02 +01:00 · 2023-08-28 00:49:14 +01:00 · 2023-08-27 19:58:20 +01:00 · 2023-08-27 17:02:12 +01:00 · 2023-08-27 14:41:02 +01:00
230 changed files with 25074 additions and 10465 deletions
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -21,6 +21,8 @@ jobs:
    

    - uses: gradle/gradle-build-action@v2.4.2
+      env:
+        DOCKER_ENABLE_SECURITY: false
      with:
        gradle-version: 7.6
        arguments: clean build
@@ -77,6 +79,8 @@ jobs:
        cache-to: type=gha,mode=max
        tags: ${{ steps.meta.outputs.tags }}
        labels: ${{ steps.meta.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
        platforms: linux/amd64,linux/arm64/v8


@@ -105,6 +109,8 @@ jobs:
        cache-to: type=gha,mode=max
        tags: ${{ steps.meta2.outputs.tags }}
        labels: ${{ steps.meta2.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
        platforms: linux/amd64,linux/arm64/v8


--- a/.github/workflows/releaseArtifacts.yml
+++ b/.github/workflows/releaseArtifacts.yml
@@ -1,10 +1,20 @@
 name: Release Artifacts
+
 on: 
  release: 
    types: [created]
+
 jobs:
  push:
    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        enable_security: [true, false]
+        include:
+          - enable_security: true
+            file_suffix: '-with-login'
+          - enable_security: false
+            file_suffix: ''
    steps:
    - uses: actions/checkout@v3.5.2
    
@@ -17,15 +27,17 @@ jobs:
    - name: Grant execute permission for gradlew
      run: chmod +x gradlew

-    - name: Generate jar
+    - name: Generate jar (With Security=${{ matrix.enable_security }})
      run: ./gradlew clean createExe
+      env:
+        DOCKER_ENABLE_SECURITY: ${{ matrix.enable_security }}

    - name: Upload binaries to release
      uses: svenstaro/upload-release-action@v2
      with:
        repo_token: ${{ secrets.GITHUB_TOKEN }}
        file: ./build/launch4j/Stirling-PDF.exe
-        asset_name: Stirling-PDF.exe
+        asset_name: Stirling-PDF${{ matrix.file_suffix }}.exe
        tag: ${{ github.ref }}
        overwrite: true
    
@@ -33,13 +45,11 @@ jobs:
      id: versionNumber
      run: echo "::set-output name=versionNumber::$(./gradlew printVersion --quiet | tail -1)"
      
-    - name: Upload binaries to release
+    - name: Upload jar binaries to release
      uses: svenstaro/upload-release-action@v2
      with:
        repo_token: ${{ secrets.GITHUB_TOKEN }}
        file: ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar
-        asset_name: Stirling-PDF.jar
+        asset_name: Stirling-PDF${{ matrix.file_suffix }}.jar
        tag: ${{ github.ref }}
        overwrite: true
-
-
--- a/.gitignore
+++ b/.gitignore
@@ -1,115 +1,122 @@
-
-
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-.classpath
-.project
-version.properties
-
-# Gradle
-.gradle
-.lock
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-.apt_generated_test/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-# Uncomment this line if you wish to ignore the project description file.
-# Typically, this file would be tracked if it contains build/dependency configurations:
-#.project
-
-### Eclipse Patch ###
-# Spring Boot Tooling
-.sts4-cache/
-
-### Git ###
-# Created by git for backups. To disable backups in Git:
-# $ git config --global mergetool.keepBackup false
-*.orig
-
-# Created by git when using merge tools for conflicts
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-*_BACKUP_*.txt
-*_BASE_*.txt
-*_LOCAL_*.txt
-*_REMOTE_*.txt
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-/build
-
+
+
+### Eclipse ###
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+.classpath
+.project
+version.properties
+pipeline/
+
+#### Stirling-PDF Files ###
+customFiles/
+configs/
+watchedFolders/
+
+
+# Gradle
+.gradle
+.lock
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
+
+### Eclipse Patch ###
+# Spring Boot Tooling
+.sts4-cache/
+
+### Git ###
+# Created by git for backups. To disable backups in Git:
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+*.db
+/build
+
 /.vscode
--- a/11
+++ b/11
@@ -1,5 +1,10 @@
 # Build jbig2enc in a separate stage
-FROM frooodle/stirling-pdf-base:latest
+FROM frooodle/stirling-pdf-base:beta4
+
+ARG VERSION_TAG
+ENV VERSION_TAG=$VERSION_TAG
+
+ENV DOCKER_ENABLE_SECURITY=false

 # Create scripts folder and copy local scripts
 RUN mkdir /scripts
@@ -11,7 +16,7 @@ COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 RUN fc-cache -f -v

-# Copy the application JAR file
+# Always copy the JAR 
 COPY build/libs/*.jar app.jar

 # Expose the application port
@@ -19,8 +24,6 @@ EXPOSE 8080

 # Set environment variables
 ENV APP_HOME_NAME="Stirling PDF"
-#ENV APP_HOME_DESCRIPTION="Personal PDF Website!"
-#ENV APP_NAVBAR_NAME="Stirling PDF"

 # Run the application
 RUN chmod +x /scripts/init.sh
--- a/3
+++ b/3
@@ -13,11 +13,14 @@ RUN apt-get update && \
 # Copy the application JAR file
 COPY build/libs/*.jar app.jar

+
+
 # Expose the application port
 EXPOSE 8080

 # Set environment variables
 ENV GROUPS_TO_REMOVE=Python,OpenCV,OCRmyPDF
+ENV DOCKER_ENABLE_SECURITY=false

 # Run the application
 CMD ["java", "-jar", "/app.jar"]
--- a/3
+++ b/3
@@ -7,8 +7,11 @@ COPY build/libs/*.jar app.jar
 # Expose the application port
 EXPOSE 8080

+
+
 # Set environment variables
 ENV GROUPS_TO_REMOVE=CLI
+ENV DOCKER_ENABLE_SECURITY=false

 # Run the application
 CMD ["java", "-jar", "/app.jar"]
--- a/2
+++ b/2
@@ -29,7 +29,7 @@ RUN apt-get update && \
        libjpeg-dev && \
    pip install --upgrade pip && \
    pip install --no-cache-dir \
-        opencv-python-headless && \
+        opencv-python-headless WeasyPrint && \
    rm -rf /var/lib/apt/lists/*

 # Final stage: Copy necessary files from the previous stage
--- a/Endpoint-groups.md
+++ b/Endpoint-groups.md
@@ -1,35 +1,46 @@
-| Operation           | PageOps | Convert | Security | Other | CLI  | Python | OpenCV | LibreOffice | OCRmyPDF | Java     | Javascript |
-|---------------------|---------|---------|----------|-------|------|--------|--------|-------------|----------|----------|------------|
-| merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
-| remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| split-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
-| file-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| img-to-pdf          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
-| pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
-| pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| pdf-to-xml          |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| xlsx-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
-| add-password        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| add-watermark       |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| cert-sign           |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| change-permissions  |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| remove-password     |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
-| add-image           |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| change-metadata     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| compare             |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
-| compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
-| extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
-| extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
-| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |            |
-| ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
-| remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
-| repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
-| sign                |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| Operation           | PageOps | Convert | Security | Other | CLI  | Python | OpenCV | LibreOffice | OCRmyPDF | Java     | Javascript |
+|---------------------|---------|---------|----------|-------|------|--------|--------|-------------|----------|----------|------------|
+| adjust-contrast     |    ✔️    |         |          |       |      |        |        |             |          |           |    ✔️      |
+| auto-split-pdf      |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| crop                |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| extract-page        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
+| pdf-to-single-page  |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| split-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| file-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| img-to-pdf          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
+| pdf-to-markdown     |         |    ✔️    |          |       |      |        |        |             |            |    ✔️      |            |
+| pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-xml          |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| xlsx-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| add-password        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-watermark       |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| cert-sign           |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| change-permissions  |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| remove-password     |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| sanitize-pdf        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-image           |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| add-page-numbers    |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| auto-rename         |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| change-metadata     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| compare             |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |      ✔️      |
+| get-info-on-pdf     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️      |            |
+| ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
+| show-javascript     |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| sign                |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
--- a/HowToUseOCR.md
+++ b/HowToUseOCR.md
@@ -3,7 +3,7 @@
 This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker.

 ## How does the OCR Work
-Stirling-PDF uses OCRmyPDF which in turn uses tesseract for its text recognition.
+Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition.
 All credit goes to them for this awesome work! 

 ## Language Packs
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@
 [![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
 [![Github Sponser](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)

+[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Frooodle/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
+
 This is a powerful locally hosted web based PDF manipulation tool using docker that allows you to perform various operations on PDF files, such as splitting merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application started as a 100% ChatGPT-made application and has evolved to include a wide range of features to handle all your PDF needs.

 Stirling PDF makes no outbound calls for any record keeping or tracking.
@@ -27,6 +29,11 @@ Feel free to request any features or bug fixes either in github issues or our [D
 - Convert PDFs to and from images
 - Reorganize PDF pages into different orders.
 - Add/Generate signatures
+- Format PDFs into a multi-paged page
+- Scale page contents size by set % 
+- Adjust Contrast
+- Crop PDF
+- Auto Split PDF (With physically scanned page dividers)
 - Flatten PDFs
 - Repair PDFs
 - Detect and remove blank pages
@@ -39,8 +46,14 @@ Feel free to request any features or bug fixes either in github issues or our [D
 - Add watermark(s)
 - Convert Any common file to PDF (using LibreOffice)
 - Convert PDF to Word/Powerpoint/Others (using LibreOffice)
+- Convert HTML to PDF
+- URL to PDF
 - Extract images from PDF
+- Extract images from Scans
+- Add page numbers
+- Auto rename file by detecting PDF header text
 - OCR on PDF (Using OCRMyPDF)
+- PDF/A conversion (Using OCRMyPDF)
 - Edit metadata
 - Dark mode support.
 - Custom download options (see [here](https://github.com/Frooodle/Stirling-PDF/blob/main/images/settings.png) for example)
@@ -86,6 +99,8 @@ docker run -d \
  
  
  Can also add these for customisation but are not required
+  -v /location/of/extraConfigs:/configs \
+  -v /location/of/customFiles:/customFiles \
  -e APP_HOME_NAME="Stirling PDF" \
  -e APP_HOME_DESCRIPTION="Your locally hosted one-stop-shop for all your PDF needs." \
  -e APP_NAVBAR_NAME="Stirling PDF" \
@@ -104,6 +119,7 @@ services:
    volumes:
      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
 #      - /location/of/extraConfigs:/configs
+#      - /location/of/customFiles:/customFiles/
 #    environment:
 #      APP_LOCALE: en_GB
 #      APP_HOME_NAME: Stirling PDF
@@ -160,28 +176,43 @@ Using the same method you can also change
 - Enable/Disable search engine visiblility with ALLOW_GOOGLE_VISIBILITY with true / false values. Default disable visiblility.
 - Change root URI for Stirling-PDF ie change server.com/ to server.com/pdf-app by running APP_ROOT_PATH as pdf-app
 - Disable and remove endpoints and functionality from Stirling-PDF. Currently the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma seperated lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image to pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/groups.md) 
-
+- Change the max file size allowed through the server with the environment variable MAX_FILE_SIZE. default  2000MB
+- Customise static files such as app logo by placing files in the /customFiles/static/ directory. Example to customise app logo is placing a /customFiles/static/favicon.svg to override current SVG. This can be used to change any images/icons/css/fonts/js etc in Stirling-PDF
+- Enable/Disable metric api endpoints with ENABLE_API_METRICS. Default enabled

 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
-[here](https://app.swaggerhub.com/apis-docs/Frooodle/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation 
+[here](https://app.swaggerhub.com/apis-docs/Frooodle/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
+
+
+## Login authentication (CURRENTLY ALPHA TAG ONLY)
+### Prerequisites: 
+- User must have the folder ./configs volumed within docker so that it is retained during updates.
+- The environment variable 'login.enabled' must be set to true
+- The environment variables "INITIAL_USERNAME" and "INITIAL_PASSWORD" must also be populated (only required on first boot to create initial user, ignored after.)
+
+Once the above has been done, on restart a new stirling-pdf-DB.mv.db will show if everything worked.
+
+When you login to Stirling PDF you will be redirected to /login page to login with those credentials. After login everything should function as normal
+
+To access your account settings go to Account settings in the settings cog menu (top right in navbar) this Account settings menu is also where you find your API key.
+
+To add new users go to bottom of Account settings and hit 'Admin Settings', here you can add new users. The different roles mentioned within this are for rate limiting. This is a Work in progress which will be expanding on more in future
+
+For API usage you must provide a header with 'X-API-Key' and the associated API key for that user.


 ## FAQ

-### Q1: Can you add authentication in Stirling PDF?
-There is no Auth within Stirling PDF and there is none planned. This feature will not be added. Instead we recommended you use trusted and secure authentication software like Authentik or Authelia.
-
-### Q2: What are your planned features?
- Crop
+### Q1: What are your planned features?
 - Progress bar/Tracking
 - Full custom logic pipelines to combine multiple operations together.
 - Folder support with auto scanning to perform operations on
- Redact sections of pages
- Add page numbers
- Auto rename (Renames file based on file title text)
- URL to PDF
- Change contrast
+- Redact text (Via UI)
+- Add Forms
+- Annotations
+- Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing 
+- Fill forms mannual and automatic 

-### Q3: Why is my application downloading .htm files?
+### Q2: Why is my application downloading .htm files?
 This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files.
--- a/Version-groups.md
+++ b/Version-groups.md
@@ -1,48 +1,59 @@
-|Technology      | Ultra-Lite | Lite | Full |
-|----------------|:----------:|:----:|:----:|
-| Java           |     ✔️      |  ✔️  |  ✔️  |
-| JavaScript     |     ✔️      |  ✔️  |  ✔️  |
-| Libre          |             |  ✔️  |  ✔️  |
-| Python         |             |      |  ✔️  |
-| OpenCV         |             |      |  ✔️  |
-| OCRmyPDF       |             |      |  ✔️  |
-
-
-
-
-
-Operation           | Ultra-Lite | Lite | Full
--------------------|------------|------|-----
-add-password        |     ✔️      |  ✔️   |  ✔️
-add-watermark       |     ✔️      |  ✔️   |  ✔️
-cert-sign           |     ✔️      |  ✔️   |  ✔️
-change-metadata     |     ✔️      |  ✔️   |  ✔️
-change-permissions  |     ✔️      |  ✔️   |  ✔️
-compare             |     ✔️      |  ✔️   |  ✔️
-extract-images      |     ✔️      |  ✔️   |  ✔️
-flatten             |     ✔️      |  ✔️   |  ✔️
-img-to-pdf          |     ✔️      |  ✔️   |  ✔️
-merge-pdfs          |     ✔️      |  ✔️   |  ✔️
-multi-page-layout   |     ✔️      |  ✔️   |  ✔️
-pdf-organizer       |     ✔️      |  ✔️   |  ✔️
-pdf-to-img          |     ✔️      |  ✔️   |  ✔️
-remove-pages        |     ✔️      |  ✔️   |  ✔️
-remove-password     |     ✔️      |  ✔️   |  ✔️
-rotate-pdf          |     ✔️      |  ✔️   |  ✔️
-scale-pages         |     ✔️      |  ✔️   |  ✔️
-sign                |     ✔️      |  ✔️   |  ✔️
-split-pdfs          |     ✔️      |  ✔️   |  ✔️
-add-image           |     ✔️      |  ✔️   |  ✔️
-file-to-pdf         |             |  ✔️   |  ✔️
-pdf-to-html         |             |  ✔️   |  ✔️
-pdf-to-presentation |             |  ✔️   |  ✔️
-pdf-to-text         |             |  ✔️   |  ✔️
-pdf-to-word         |             |  ✔️   |  ✔️
-pdf-to-xml          |             |  ✔️   |  ✔️
-repair              |             |  ✔️   |  ✔️
-xlsx-to-pdf         |             |  ✔️   |  ✔️
-compress-pdf        |             |       |  ✔️
-extract-image-scans |             |       |  ✔️
-ocr-pdf             |             |       |  ✔️
-pdf-to-pdfa         |             |       |  ✔️
-remove-blanks       |             |       |  ✔️
+|Technology      | Ultra-Lite | Lite | Full |
+|----------------|:----------:|:----:|:----:|
+| Java           |     ✔️      |  ✔️  |  ✔️  |
+| JavaScript     |     ✔️      |  ✔️  |  ✔️  |
+| Libre          |             |  ✔️  |  ✔️  |
+| Python         |             |      |  ✔️  |
+| OpenCV         |             |      |  ✔️  |
+| OCRmyPDF       |             |      |  ✔️  |
+
+
+
+
+
+Operation           | Ultra-Lite | Lite | Full
+--------------------|------------|------|-----
+add-page-numbers    |     ✔️      |  ✔️   |  ✔️
+add-password        |     ✔️      |  ✔️   |  ✔️
+add-image           |     ✔️      |  ✔️   |  ✔️
+add-watermark       |     ✔️      |  ✔️   |  ✔️
+adjust-contrast     |     ✔️      |  ✔️   |  ✔️
+auto-split-pdf      |     ✔️      |  ✔️   |  ✔️
+auto-rename         |     ✔️      |  ✔️   |  ✔️
+cert-sign           |     ✔️      |  ✔️   |  ✔️
+crop                |     ✔️      |  ✔️   |  ✔️
+change-metadata     |     ✔️      |  ✔️   |  ✔️
+change-permissions  |     ✔️      |  ✔️   |  ✔️
+compare             |     ✔️      |  ✔️   |  ✔️
+extract-page        |     ✔️      |  ✔️   |  ✔️
+extract-images      |     ✔️      |  ✔️   |  ✔️
+flatten             |     ✔️      |  ✔️   |  ✔️
+get-info-on-pdf     |     ✔️      |  ✔️   |  ✔️
+img-to-pdf          |     ✔️      |  ✔️   |  ✔️
+markdown-to-pdf     |     ✔️      |  ✔️   |  ✔️
+merge-pdfs          |     ✔️      |  ✔️   |  ✔️
+multi-page-layout   |     ✔️      |  ✔️   |  ✔️
+pdf-organizer       |     ✔️      |  ✔️   |  ✔️
+pdf-to-img          |     ✔️      |  ✔️   |  ✔️
+pdf-to-single-page  |     ✔️      |  ✔️   |  ✔️
+remove-pages        |     ✔️      |  ✔️   |  ✔️
+remove-password     |     ✔️      |  ✔️   |  ✔️
+rotate-pdf          |     ✔️      |  ✔️   |  ✔️
+sanitize-pdf        |     ✔️      |  ✔️   |  ✔️
+scale-pages         |     ✔️      |  ✔️   |  ✔️
+sign                |     ✔️      |  ✔️   |  ✔️
+show-javascript     |     ✔️      |  ✔️   |  ✔️
+split-pdfs          |     ✔️      |  ✔️   |  ✔️
+file-to-pdf         |             |  ✔️   |  ✔️
+pdf-to-html         |             |  ✔️   |  ✔️
+pdf-to-presentation |             |  ✔️   |  ✔️
+pdf-to-text         |             |  ✔️   |  ✔️
+pdf-to-word         |             |  ✔️   |  ✔️
+pdf-to-xml          |             |  ✔️   |  ✔️
+repair              |             |  ✔️   |  ✔️
+xlsx-to-pdf         |             |  ✔️   |  ✔️
+compress-pdf        |             |       |  ✔️
+extract-image-scans |             |       |  ✔️
+ocr-pdf             |             |       |  ✔️
+pdf-to-pdfa         |             |       |  ✔️
+remove-blanks       |             |       |  ✔️
--- a/build.gradle
+++ b/build.gradle
@@ -1,20 +1,38 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.1'
-	id 'io.spring.dependency-management' version '1.1.0'
+	id 'org.springframework.boot' version '3.1.2'
+	id 'io.spring.dependency-management' version '1.1.2'
 	id 'org.springdoc.openapi-gradle-plugin' version '1.6.0'
 	id "io.swagger.swaggerhub" version "1.2.0"
 	id 'edu.sc.seis.launch4j' version '3.0.3'
 }

 group = 'stirling.software'
-version = '0.10.3'
+version = '0.13.0'
 sourceCompatibility = '17'

 repositories {
 	mavenCentral()
 }

+sourceSets {
+    main {
+        java {
+            if (System.getenv('DOCKER_ENABLE_SECURITY') == 'false') {
+                exclude 'stirling/software/SPDF/config/security/**'
+                exclude 'stirling/software/SPDF/controller/api/UserController.java'
+                exclude 'stirling/software/SPDF/controller/web/AccountWebController.java'
+                exclude 'stirling/software/SPDF/model/ApiKeyAuthenticationToken.java'
+                exclude 'stirling/software/SPDF/model/Authority.java'
+                exclude 'stirling/software/SPDF/model/PersistentLogin.java'
+                exclude 'stirling/software/SPDF/model/User.java'
+                exclude 'stirling/software/SPDF/repository/**'
+            }
+        }
+    }
+}
+
+
 openApi {
    apiDocsUrl = "http://localhost:8080/v3/api-docs"
    outputDir = file("$projectDir")
@@ -45,9 +63,21 @@ launch4j {
 }

 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-web:3.1.0'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.1'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.0'
+	implementation 'org.yaml:snakeyaml:2.1'
+	implementation 'org.springframework.boot:spring-boot-starter-web:3.1.2'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.2'
+	
+	if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
+        implementation 'org.springframework.boot:spring-boot-starter-security:3.1.2'
+        implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
+        implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+		implementation "com.h2database:h2"
+    }
+	
+	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.2'
+	
+	
+
 	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
 	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
 	implementation 'commons-io:commons-io:2.13.0'
@@ -55,12 +85,17 @@ dependencies {
    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
    
 	//general PDF
-    implementation 'org.apache.pdfbox:pdfbox:2.0.28'
+    implementation 'org.apache.pdfbox:pdfbox:2.0.29'
    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' 
    implementation 'com.itextpdf:itext7-core:7.2.5'
    implementation 'org.springframework.boot:spring-boot-starter-actuator'
    implementation 'io.micrometer:micrometer-core'
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.1'
+    // https://mvnrepository.com/artifact/org.commonmark/commonmark
+	implementation 'org.commonmark:commonmark:0.21.0'
+    // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
+	implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
    
    developmentOnly("org.springframework.boot:spring-boot-devtools")

--- a/images/stirling-home.png
+++ b/images/stirling-home.png
--- a/scripts/PropSync.java
+++ b/scripts/PropSync.java
@@ -0,0 +1,80 @@
+package stirling.software.Stirling.Stats;
+
+import java.nio.file.*;
+import java.nio.charset.MalformedInputException;
+import java.nio.charset.StandardCharsets;
+import java.io.*;
+import java.util.*;
+
+public class PropSync {
+
+    public static void main(String[] args) throws IOException {
+        File folder = new File("C:\\Users\\systo\\git\\Stirling-PDF\\src\\main\\resources");
+        File[] files = folder.listFiles((dir, name) -> name.matches("messages_.*\\.properties"));
+
+        List<String> enLines = Files.readAllLines(Paths.get(folder + "\\messages_en_GB.properties"), StandardCharsets.UTF_8);
+        Map<String, String> enProps = linesToProps(enLines);
+
+        for (File file : files) {
+            if (!file.getName().equals("messages_en_GB.properties")) {
+                System.out.println("Processing file: " + file.getName());
+                List<String> lines;
+                try {
+                    lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
+                } catch (MalformedInputException e) {
+                    System.out.println("Skipping due to not UTF8 format for file: " + file.getName());
+                    continue;
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+
+                Map<String, String> currentProps = linesToProps(lines);
+                List<String> newLines = syncPropsWithLines(enProps, currentProps, enLines);
+
+                Files.write(file.toPath(), newLines, StandardCharsets.UTF_8);
+                System.out.println("Finished processing file: " + file.getName());
+            }
+        }
+    }
+
+    private static Map<String, String> linesToProps(List<String> lines) {
+        Map<String, String> props = new LinkedHashMap<>();
+        for (String line : lines) {
+            if (!line.trim().isEmpty() && line.contains("=")) {
+                String[] parts = line.split("=", 2);
+                props.put(parts[0].trim(), parts[1].trim());
+            }
+        }
+        return props;
+    }
+
+    private static List<String> syncPropsWithLines(Map<String, String> enProps, Map<String, String> currentProps, List<String> enLines) {
+        List<String> newLines = new ArrayList<>();
+        boolean needsTranslateComment = false; // flag to check if we need to add "TODO: Translate"
+
+        for (String line : enLines) {
+            if (line.contains("=")) {
+                String key = line.split("=", 2)[0].trim();
+
+                if (currentProps.containsKey(key)) {
+                    newLines.add(key + "=" + currentProps.get(key));
+                    needsTranslateComment = false;
+                } else {
+                    if (!needsTranslateComment) {
+                        newLines.add("##########################");
+                        newLines.add("###  TODO: Translate   ###");
+                        newLines.add("##########################");
+                        needsTranslateComment = true;
+                    }
+                    newLines.add(line);
+                }
+            } else {
+                // handle comments and other non-property lines
+                newLines.add(line);
+                needsTranslateComment = false;  // reset the flag when we encounter comments or empty lines
+            }
+        }
+
+        return newLines;
+    }
+}
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -5,5 +5,27 @@ echo "Copying original files without overwriting existing files"
 mkdir -p /usr/share/tesseract-ocr
 cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr

+# Check if TESSERACT_LANGS environment variable is set and is not empty
+if [[ -n "$TESSERACT_LANGS" ]]; then
+  # Convert comma-separated values to a space-separated list
+  LANGS=$(echo $TESSERACT_LANGS | tr ',' ' ')
+
+  # Install each language pack
+  for LANG in $LANGS; do
+    apt-get install -y "tesseract-ocr-$LANG"
+  done
+fi
+
+# Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
+if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
+	echo "Downloading from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
+    curl -L -o new-app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+    if [ $? -eq 0 ]; then  # checks if curl was successful
+        rm -f app.jar
+        mv new-app.jar app.jar
+    fi
+fi
+
+
 # Run the main command
 exec "$@"
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -1,63 +1,84 @@
-package stirling.software.SPDF;
-
-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 jakarta.annotation.PostConstruct;
-
-@SpringBootApplication
-//@EnableScheduling
-public class SPdfApplication {
-	
-	@Autowired
-    private Environment env;
-
-    @PostConstruct
-    public void init() {
-        // Check if the BROWSER_OPEN environment variable is set to true
-        String browserOpenEnv = env.getProperty("BROWSER_OPEN");
-        boolean browserOpen = browserOpenEnv != null && browserOpenEnv.equalsIgnoreCase("true");
-
-        if (browserOpen) {
-            try {
-                String port = env.getProperty("local.server.port");
-                if(port == null || port.length() == 0) {
-                	port="8080";
-                }
-                String url = "http://localhost:" + port;
-
-                String os = System.getProperty("os.name").toLowerCase();
-                Runtime rt = Runtime.getRuntime();
-                if (os.contains("win")) {
-                    // For Windows
-                    rt.exec("rundll32 url.dll,FileProtocolHandler " + url);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-	
-    public static void main(String[] args) {
-        SpringApplication.run(SPdfApplication.class, args);
-        try {
-			Thread.sleep(1000);
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        System.out.println("Stirling-PDF Started.");
-        
-        String port = System.getProperty("local.server.port");
-        if(port == null || port.length() == 0) {
-        	port="8080";
-        }
-        String url = "http://localhost:" + port;
-        System.out.println("Navigate to " + url);
-    }
-    
-    
+package stirling.software.SPDF;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
+
+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 jakarta.annotation.PostConstruct;
+import stirling.software.SPDF.config.ConfigInitializer;
+import stirling.software.SPDF.utils.GeneralUtils;
+@SpringBootApplication
+
+//@EnableScheduling
+public class SPdfApplication {
+	
+	@Autowired
+    private Environment env;
+
+    @PostConstruct
+    public void init() {
+        // Check if the BROWSER_OPEN environment variable is set to true
+        String browserOpenEnv = env.getProperty("BROWSER_OPEN");
+        boolean browserOpen = browserOpenEnv != null && browserOpenEnv.equalsIgnoreCase("true");
+
+        if (browserOpen) {
+            try {
+                String port = env.getProperty("local.server.port");
+                if(port == null || port.length() == 0) {
+                	port="8080";
+                }
+                String url = "http://localhost:" + port;
+
+                String os = System.getProperty("os.name").toLowerCase();
+                Runtime rt = Runtime.getRuntime();
+                if (os.contains("win")) {
+                    // For Windows
+                    rt.exec("rundll32 url.dll,FileProtocolHandler " + url);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+	
+    public static void main(String[] args) {
+    	SpringApplication app = new SpringApplication(SPdfApplication.class);
+    	app.addInitializers(new ConfigInitializer());
+    	if (Files.exists(Paths.get("configs/settings.yml"))) {
+            app.setDefaultProperties(Collections.singletonMap("spring.config.location", "file:configs/settings.yml"));
+        } else {
+            System.out.println("External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
+        }
+        app.run(args);
+        
+        try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        
+        GeneralUtils.createDir("customFiles/static/");
+        GeneralUtils.createDir("customFiles/templates/");
+        GeneralUtils.createDir("config");
+        
+        
+        
+        System.out.println("Stirling-PDF Started.");
+        
+        String port = System.getProperty("local.server.port");
+        if(port == null || port.length() == 0) {
+        	port="8080";
+        }
+        String url = "http://localhost:" + port;
+        System.out.println("Navigate to " + url);
+    }
+    
+    
 }
--- a/src/main/java/stirling/software/SPDF/config/AppConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java
@@ -1,42 +1,54 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AppConfig {
-    @Bean(name = "appName")
-    public String appName() {
-        String appName = System.getProperty("APP_HOME_NAME");
-        if (appName == null)
-            appName = System.getenv("APP_HOME_NAME");
-        return (appName != null) ? appName : "Stirling PDF";
-    }
-
-    @Bean(name = "appVersion")
-    public String appVersion() {
-        String version = getClass().getPackage().getImplementationVersion();
-        return (version != null) ? version : "0.0.0";
-    }
-
-    @Bean(name = "homeText")
-    public String homeText() {
-        String homeText = System.getProperty("APP_HOME_DESCRIPTION");
-        if (homeText == null)
-            homeText = System.getenv("APP_HOME_DESCRIPTION");
-        return (homeText != null) ? homeText : "null";
-    }
-
-    @Bean(name = "navBarText")
-    public String navBarText() {
-        String navBarText = System.getProperty("APP_NAVBAR_NAME");
-        if (navBarText == null)
-            navBarText = System.getenv("APP_NAVBAR_NAME");
-        if (navBarText == null)
-            navBarText = System.getProperty("APP_HOME_NAME");
-        if (navBarText == null)
-            navBarText = System.getenv("APP_HOME_NAME");
-
-        return (navBarText != null) ? navBarText : "Stirling PDF";
-    }
+package stirling.software.SPDF.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+@Configuration
+public class AppConfig {
+
+    @Autowired
+    ApplicationProperties applicationProperties;
+    
+    @Bean(name = "loginEnabled")
+    public boolean loginEnabled() {
+        System.out.println(applicationProperties.toString());
+        return applicationProperties.getSecurity().getEnableLogin();
+    }
+
+    @Bean(name = "appName")
+    public String appName() {
+        String homeTitle =  applicationProperties.getUi().getAppName();
+        return (homeTitle != null) ? homeTitle : "Stirling PDF";
+    }
+
+    @Bean(name = "appVersion")
+    public String appVersion() {
+        String version = getClass().getPackage().getImplementationVersion();
+        return (version != null) ? version : "0.0.0";
+    }
+
+    @Bean(name = "homeText")
+    public String homeText() {
+    	return (applicationProperties.getUi().getHomeDescription() != null) ? applicationProperties.getUi().getHomeDescription() : "null";
+    }
+
+
+    @Bean(name = "navBarText")
+    public String navBarText() {
+        String defaultNavBar = applicationProperties.getUi().getAppNameNavbar() != null ? applicationProperties.getUi().getAppNameNavbar() : applicationProperties.getUi().getAppName();
+        return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
+    }
+	
+	@Bean(name = "rateLimit")
+    public boolean rateLimit() {
+        String appName = System.getProperty("rateLimit");
+        if (appName == null) 
+            appName = System.getenv("rateLimit");
+        System.out.println("rateLimit=" + appName);
+        return (appName != null) ? Boolean.valueOf(appName) : false;
+    }
+	
+	
 }
--- a/src/main/java/stirling/software/SPDF/config/Beans.java
+++ b/src/main/java/stirling/software/SPDF/config/Beans.java
@@ -1,60 +1,65 @@
-package stirling.software.SPDF.config;
-
-import java.util.Locale;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-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;
-
-@Configuration
-public class Beans implements WebMvcConfigurer {
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(localeChangeInterceptor());
-        registry.addInterceptor(new CleanUrlInterceptor());
-    }
-
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor() {
-        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-        lci.setParamName("lang");
-        return lci;
-    }
-
-    @Bean
-    public LocaleResolver localeResolver() {
-        SessionLocaleResolver slr = new SessionLocaleResolver();
-
-        String appLocaleEnv = System.getProperty("APP_LOCALE");
-        if (appLocaleEnv == null)
-            appLocaleEnv = System.getenv("APP_LOCALE");
-        Locale defaultLocale = Locale.UK; // Fallback to UK locale if environment variable is not set
-
-        if (appLocaleEnv != null && !appLocaleEnv.isEmpty()) {
-            Locale tempLocale = Locale.forLanguageTag(appLocaleEnv);
-            String tempLanguageTag = tempLocale.toLanguageTag();
-
-             if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
-                defaultLocale = tempLocale;
-            } else {
-                tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_","-"));
-                tempLanguageTag = tempLocale.toLanguageTag();
-
-                if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
-                    defaultLocale = tempLocale;
-                } else {
-                    System.err.println("Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
-                }
-            }
-        }
-
-        slr.setDefaultLocale(defaultLocale);
-        return slr;
-    }
-    
-}
+package stirling.software.SPDF.config;
+
+import java.util.Locale;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.LocaleResolver;
+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 stirling.software.SPDF.model.ApplicationProperties;
+
+@Configuration
+public class Beans implements WebMvcConfigurer {
+	
+	@Autowired
+    ApplicationProperties applicationProperties;
+	
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(localeChangeInterceptor());
+        registry.addInterceptor(new CleanUrlInterceptor());
+    }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        lci.setParamName("lang");
+        return lci;
+    }
+
+    @Bean
+    public LocaleResolver localeResolver() {
+        SessionLocaleResolver slr = new SessionLocaleResolver();
+        
+        
+        String appLocaleEnv = applicationProperties.getSystem().getDefaultLocale();
+        Locale defaultLocale = Locale.UK; // Fallback to UK locale if environment variable is not set
+
+        if (appLocaleEnv != null && !appLocaleEnv.isEmpty()) {
+            Locale tempLocale = Locale.forLanguageTag(appLocaleEnv);
+            String tempLanguageTag = tempLocale.toLanguageTag();
+
+             if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
+                defaultLocale = tempLocale;
+            } else {
+                tempLocale = Locale.forLanguageTag(appLocaleEnv.replace("_","-"));
+                tempLanguageTag = tempLocale.toLanguageTag();
+
+                if (appLocaleEnv.equalsIgnoreCase(tempLanguageTag)) {
+                    defaultLocale = tempLocale;
+                } else {
+                    System.err.println("Invalid APP_LOCALE environment variable value. Falling back to default Locale.UK.");
+                }
+            }
+        }
+
+        slr.setDefaultLocale(defaultLocale);
+        return slr;
+    }
+    
+}
--- a/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java
+++ b/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java
@@ -1,79 +1,70 @@
-package stirling.software.SPDF.config;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.Arrays;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-public class CleanUrlInterceptor implements HandlerInterceptor {
-
-	private static final List<String> ALLOWED_PARAMS = Arrays.asList("lang", "endpoint", "endpoints");
-
-	@Override
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-			throws Exception {
-		String queryString = request.getQueryString();
-		if (queryString != null && !queryString.isEmpty()) {
-			String requestURI = request.getRequestURI();
-
-			Map<String, String> parameters = new HashMap<>();
-
-			// Keep only the allowed parameters
-			String[] queryParameters = queryString.split("&");
-			for (String param : queryParameters) {
-				String[] keyValue = param.split("=");
-				if (keyValue.length != 2) {
-					continue;
-				}
-				if (ALLOWED_PARAMS.contains(keyValue[0])) {
-					parameters.put(keyValue[0], keyValue[1]);
-				}
-			}
-
-			// If there are any parameters that are not allowed
-			if (parameters.size() != queryParameters.length) {
-				// Construct new query string
-				StringBuilder newQueryString = new StringBuilder();
-				for (Map.Entry<String, String> entry : parameters.entrySet()) {
-					if (newQueryString.length() > 0) {
-						newQueryString.append("&");
-					}
-					newQueryString.append(entry.getKey()).append("=").append(entry.getValue());
-				}
-
-				// Redirect to the URL with only allowed query parameters
-				String redirectUrl = requestURI + "?" + newQueryString;
-				response.sendRedirect(redirectUrl);
-				return false;
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
-			ModelAndView modelAndView) {
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
-			Exception ex) {
-	}
-}
+package stirling.software.SPDF.config;
+
+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("lang", "endpoint", "endpoints", "logout", "error", "file");
+
+	
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+			throws Exception {
+		String queryString = request.getQueryString();
+		if (queryString != null && !queryString.isEmpty()) {
+			String requestURI = request.getRequestURI();
+
+			Map<String, String> parameters = new HashMap<>();
+
+			// Keep only the allowed parameters
+			String[] queryParameters = queryString.split("&");
+			for (String param : queryParameters) {
+				String[] keyValue = param.split("=");
+				if (keyValue.length != 2) {
+					continue;
+				}
+
+				if (ALLOWED_PARAMS.contains(keyValue[0])) {
+					parameters.put(keyValue[0], keyValue[1]);
+				}
+			}
+
+			// If there are any parameters that are not allowed
+			if (parameters.size() != queryParameters.length) {
+				// Construct new query string
+				StringBuilder newQueryString = new StringBuilder();
+				for (Map.Entry<String, String> entry : parameters.entrySet()) {
+					if (newQueryString.length() > 0) {
+						newQueryString.append("&");
+					}
+					newQueryString.append(entry.getKey()).append("=").append(entry.getValue());
+				}
+
+				// Redirect to the URL with only allowed query parameters
+				String redirectUrl = requestURI + "?" + newQueryString;
+				response.sendRedirect(redirectUrl);
+				return false;
+			}
+		}
+		return true;
+	}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+			ModelAndView modelAndView) {
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
+			Exception ex) {
+	}
+}
--- a/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
+++ b/src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
@@ -0,0 +1,43 @@
+package stirling.software.SPDF.config;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+
+public class ConfigInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    @Override
+    public void initialize(ConfigurableApplicationContext applicationContext) {
+        try {
+            ensureConfigExists();
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to initialize application configuration", e);
+        }
+    }
+
+	public void ensureConfigExists() throws IOException {
+		// Define the path to the external config directory
+		Path destPath = Paths.get("configs", "settings.yml");
+
+		// Check if the file already exists
+		if (Files.notExists(destPath)) {
+			// Ensure the destination directory exists
+			Files.createDirectories(destPath.getParent());
+
+			// Copy the resource from classpath to the external directory
+			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+				if (in != null) {
+					Files.copy(in, destPath);
+				} else {
+					throw new FileNotFoundException("Resource file not found: settings.yml.template");
+				}
+			}
+		}
+	}
+
+}
--- a/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -1,200 +1,228 @@
-package stirling.software.SPDF.config;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-@Service
-public class EndpointConfiguration {
-    private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
-    private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
-    private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
-
-    public EndpointConfiguration() {
-        init();
-        processEnvironmentConfigs();
-    }
-    
-    public void enableEndpoint(String endpoint) {
-    	endpointStatuses.put(endpoint, true);
-    }
-
-    public void disableEndpoint(String endpoint) {
-    	if(!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) !=  false) {
-	        logger.info("Disabling {}", endpoint);
-	        endpointStatuses.put(endpoint, false);
-    	}
-    }
-
-    public boolean isEndpointEnabled(String endpoint) {
-        if (endpoint.startsWith("/")) {
-            endpoint = endpoint.substring(1);
-        }
-        return endpointStatuses.getOrDefault(endpoint, true);
-    }
-
-    public void addEndpointToGroup(String group, String endpoint) {
-        endpointGroups.computeIfAbsent(group, k -> new HashSet<>()).add(endpoint);
-    }
-
-    public void enableGroup(String group) {
-        Set<String> endpoints = endpointGroups.get(group);
-        if (endpoints != null) {
-            for (String endpoint : endpoints) {
-                enableEndpoint(endpoint);
-            }
-        }
-    }
-
-    public void disableGroup(String group) {
-        Set<String> endpoints = endpointGroups.get(group);
-        if (endpoints != null) {
-            for (String endpoint : endpoints) {
-                disableEndpoint(endpoint);
-            }
-        }
-    }
-    
-    public void init() {
-        // Adding endpoints to "PageOps" group
-        addEndpointToGroup("PageOps", "remove-pages");
-        addEndpointToGroup("PageOps", "merge-pdfs");
-        addEndpointToGroup("PageOps", "split-pdfs");
-        addEndpointToGroup("PageOps", "pdf-organizer");
-        addEndpointToGroup("PageOps", "rotate-pdf");
-        addEndpointToGroup("PageOps", "multi-page-layout");
-        addEndpointToGroup("PageOps", "scale-pages");
-        
-        // Adding endpoints to "Convert" group
-        addEndpointToGroup("Convert", "pdf-to-img");
-        addEndpointToGroup("Convert", "img-to-pdf");
-        addEndpointToGroup("Convert", "pdf-to-pdfa");
-        addEndpointToGroup("Convert", "file-to-pdf");
-        addEndpointToGroup("Convert", "xlsx-to-pdf");
-        addEndpointToGroup("Convert", "pdf-to-word");
-        addEndpointToGroup("Convert", "pdf-to-presentation");
-        addEndpointToGroup("Convert", "pdf-to-text");
-        addEndpointToGroup("Convert", "pdf-to-html");
-        addEndpointToGroup("Convert", "pdf-to-xml");
-
-        // Adding endpoints to "Security" group
-        addEndpointToGroup("Security", "add-password");
-        addEndpointToGroup("Security", "remove-password");
-        addEndpointToGroup("Security", "change-permissions");
-        addEndpointToGroup("Security", "add-watermark");
-        addEndpointToGroup("Security", "cert-sign");
-        
-        
-
-        // Adding endpoints to "Other" group
-        addEndpointToGroup("Other", "ocr-pdf");
-        addEndpointToGroup("Other", "add-image");
-        addEndpointToGroup("Other", "compress-pdf");
-        addEndpointToGroup("Other", "extract-images");
-        addEndpointToGroup("Other", "change-metadata");
-        addEndpointToGroup("Other", "extract-image-scans");
-        addEndpointToGroup("Other", "sign");
-        addEndpointToGroup("Other", "flatten");
-        addEndpointToGroup("Other", "repair");
-        addEndpointToGroup("Other", "remove-blanks");
-        addEndpointToGroup("Other", "compare");
-        
-        
-        
-        
-        
-        
-        
-        //CLI
-        addEndpointToGroup("CLI", "compress-pdf");
-        addEndpointToGroup("CLI", "extract-image-scans");
-        addEndpointToGroup("CLI", "remove-blanks");
-        addEndpointToGroup("CLI", "repair");
-        addEndpointToGroup("CLI", "pdf-to-pdfa");
-        addEndpointToGroup("CLI", "file-to-pdf");
-        addEndpointToGroup("CLI", "xlsx-to-pdf");
-        addEndpointToGroup("CLI", "pdf-to-word");
-        addEndpointToGroup("CLI", "pdf-to-presentation");
-        addEndpointToGroup("CLI", "pdf-to-text");
-        addEndpointToGroup("CLI", "pdf-to-html");
-        addEndpointToGroup("CLI", "pdf-to-xml");
-        addEndpointToGroup("CLI", "ocr-pdf");
-        
-        //python
-        addEndpointToGroup("Python", "extract-image-scans");
-        addEndpointToGroup("Python", "remove-blanks");
-        
-  
-        
-        //openCV
-        addEndpointToGroup("OpenCV", "extract-image-scans");
-        addEndpointToGroup("OpenCV", "remove-blanks");
-
-        //LibreOffice
-        addEndpointToGroup("LibreOffice", "repair");
-        addEndpointToGroup("LibreOffice", "file-to-pdf");
-        addEndpointToGroup("LibreOffice", "xlsx-to-pdf");
-        addEndpointToGroup("LibreOffice", "pdf-to-word");
-        addEndpointToGroup("LibreOffice", "pdf-to-presentation");
-        addEndpointToGroup("LibreOffice", "pdf-to-text");
-        addEndpointToGroup("LibreOffice", "pdf-to-html");
-        addEndpointToGroup("LibreOffice", "pdf-to-xml");
-        
-        
-        //OCRmyPDF
-        addEndpointToGroup("OCRmyPDF", "compress-pdf");
-        addEndpointToGroup("OCRmyPDF", "pdf-to-pdfa");
-        addEndpointToGroup("OCRmyPDF", "ocr-pdf");
-        
-        //Java
-        addEndpointToGroup("Java", "merge-pdfs");
-        addEndpointToGroup("Java", "remove-pages");
-        addEndpointToGroup("Java", "split-pdfs");
-        addEndpointToGroup("Java", "pdf-organizer");
-        addEndpointToGroup("Java", "rotate-pdf");
-        addEndpointToGroup("Java", "pdf-to-img");
-        addEndpointToGroup("Java", "img-to-pdf");
-        addEndpointToGroup("Java", "add-password");
-        addEndpointToGroup("Java", "remove-password");
-        addEndpointToGroup("Java", "change-permissions");
-        addEndpointToGroup("Java", "add-watermark");
-        addEndpointToGroup("Java", "add-image");
-        addEndpointToGroup("Java", "extract-images");
-        addEndpointToGroup("Java", "change-metadata");
-        addEndpointToGroup("Java", "cert-sign");
-        addEndpointToGroup("Java", "multi-page-layout");
-        addEndpointToGroup("Java", "scale-pages");
-        
-        
-        //Javascript
-        addEndpointToGroup("Javascript", "pdf-organizer");
-        addEndpointToGroup("Javascript", "sign");
-        addEndpointToGroup("Javascript", "compare");
-        
-    }
-                
-    private void processEnvironmentConfigs() {
-        String endpointsToRemove = System.getenv("ENDPOINTS_TO_REMOVE");
-        String groupsToRemove = System.getenv("GROUPS_TO_REMOVE");
-
-        if (endpointsToRemove != null) {
-            String[] endpoints = endpointsToRemove.split(",");
-            for (String endpoint : endpoints) {
-                disableEndpoint(endpoint.trim());
-            }
-        }
-
-        if (groupsToRemove != null) {
-            String[] groups = groupsToRemove.split(",");
-            for (String group : groups) {
-                disableGroup(group.trim());
-            }
-        }
-    }
-
-}
-
+package stirling.software.SPDF.config;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+@Service
+public class EndpointConfiguration {
+    private static final Logger logger = LoggerFactory.getLogger(EndpointConfiguration.class);
+    private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
+    private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
+
+    private final ApplicationProperties applicationProperties;
+
+    @Autowired
+    public EndpointConfiguration(ApplicationProperties applicationProperties) {
+        this.applicationProperties = applicationProperties;
+        init();
+        processEnvironmentConfigs();
+    }
+    
+    public void enableEndpoint(String endpoint) {
+    	endpointStatuses.put(endpoint, true);
+    }
+
+    public void disableEndpoint(String endpoint) {
+    	if(!endpointStatuses.containsKey(endpoint) || endpointStatuses.get(endpoint) !=  false) {
+	        logger.info("Disabling {}", endpoint);
+	        endpointStatuses.put(endpoint, false);
+    	}
+    }
+
+    public boolean isEndpointEnabled(String endpoint) {
+        if (endpoint.startsWith("/")) {
+            endpoint = endpoint.substring(1);
+        }
+        return endpointStatuses.getOrDefault(endpoint, true);
+    }
+
+    public void addEndpointToGroup(String group, String endpoint) {
+        endpointGroups.computeIfAbsent(group, k -> new HashSet<>()).add(endpoint);
+    }
+
+    public void enableGroup(String group) {
+        Set<String> endpoints = endpointGroups.get(group);
+        if (endpoints != null) {
+            for (String endpoint : endpoints) {
+                enableEndpoint(endpoint);
+            }
+        }
+    }
+
+    public void disableGroup(String group) {
+        Set<String> endpoints = endpointGroups.get(group);
+        if (endpoints != null) {
+            for (String endpoint : endpoints) {
+                disableEndpoint(endpoint);
+            }
+        }
+    }
+    
+    public void init() {
+        // Adding endpoints to "PageOps" group
+        addEndpointToGroup("PageOps", "remove-pages");
+        addEndpointToGroup("PageOps", "merge-pdfs");
+        addEndpointToGroup("PageOps", "split-pdfs");
+        addEndpointToGroup("PageOps", "pdf-organizer");
+        addEndpointToGroup("PageOps", "rotate-pdf");
+        addEndpointToGroup("PageOps", "multi-page-layout");
+        addEndpointToGroup("PageOps", "scale-pages");
+        addEndpointToGroup("PageOps", "adjust-contrast");
+        addEndpointToGroup("PageOps", "crop");
+        addEndpointToGroup("PageOps", "auto-split-pdf");
+        addEndpointToGroup("PageOps", "extract-page");
+        addEndpointToGroup("PageOps", "pdf-to-single-page");
+        
+        // Adding endpoints to "Convert" group
+        addEndpointToGroup("Convert", "pdf-to-img");
+        addEndpointToGroup("Convert", "img-to-pdf");
+        addEndpointToGroup("Convert", "pdf-to-pdfa");
+        addEndpointToGroup("Convert", "file-to-pdf");
+        addEndpointToGroup("Convert", "xlsx-to-pdf");
+        addEndpointToGroup("Convert", "pdf-to-word");
+        addEndpointToGroup("Convert", "pdf-to-presentation");
+        addEndpointToGroup("Convert", "pdf-to-text");
+        addEndpointToGroup("Convert", "pdf-to-html");
+        addEndpointToGroup("Convert", "pdf-to-xml");
+        addEndpointToGroup("Convert", "html-to-pdf");
+        addEndpointToGroup("Convert", "url-to-pdf");
+        addEndpointToGroup("Convert", "markdown-to-pdf");
+        
+        // Adding endpoints to "Security" group
+        addEndpointToGroup("Security", "add-password");
+        addEndpointToGroup("Security", "remove-password");
+        addEndpointToGroup("Security", "change-permissions");
+        addEndpointToGroup("Security", "add-watermark");
+        addEndpointToGroup("Security", "cert-sign");
+        addEndpointToGroup("Security", "sanitize-pdf");
+        
+        
+        // Adding endpoints to "Other" group
+        addEndpointToGroup("Other", "ocr-pdf");
+        addEndpointToGroup("Other", "add-image");
+        addEndpointToGroup("Other", "compress-pdf");
+        addEndpointToGroup("Other", "extract-images");
+        addEndpointToGroup("Other", "change-metadata");
+        addEndpointToGroup("Other", "extract-image-scans");
+        addEndpointToGroup("Other", "sign");
+        addEndpointToGroup("Other", "flatten");
+        addEndpointToGroup("Other", "repair");
+        addEndpointToGroup("Other", "remove-blanks");
+        addEndpointToGroup("Other", "compare");
+        addEndpointToGroup("Other", "add-page-numbers");
+        addEndpointToGroup("Other", "auto-rename");
+        addEndpointToGroup("Other", "get-info-on-pdf");
+        addEndpointToGroup("Other", "show-javascript");
+        
+        
+        
+        //CLI
+        addEndpointToGroup("CLI", "compress-pdf");
+        addEndpointToGroup("CLI", "extract-image-scans");
+        addEndpointToGroup("CLI", "remove-blanks");
+        addEndpointToGroup("CLI", "repair");
+        addEndpointToGroup("CLI", "pdf-to-pdfa");
+        addEndpointToGroup("CLI", "file-to-pdf");
+        addEndpointToGroup("CLI", "xlsx-to-pdf");
+        addEndpointToGroup("CLI", "pdf-to-word");
+        addEndpointToGroup("CLI", "pdf-to-presentation");
+        addEndpointToGroup("CLI", "pdf-to-text");
+        addEndpointToGroup("CLI", "pdf-to-html");
+        addEndpointToGroup("CLI", "pdf-to-xml");
+        addEndpointToGroup("CLI", "ocr-pdf");
+        addEndpointToGroup("CLI", "html-to-pdf");
+        addEndpointToGroup("CLI", "url-to-pdf");
+        
+        
+        //python
+        addEndpointToGroup("Python", "extract-image-scans");
+        addEndpointToGroup("Python", "remove-blanks");
+        addEndpointToGroup("Python", "html-to-pdf");
+        addEndpointToGroup("Python", "url-to-pdf");
+        
+        //openCV
+        addEndpointToGroup("OpenCV", "extract-image-scans");
+        addEndpointToGroup("OpenCV", "remove-blanks");
+
+        //LibreOffice
+        addEndpointToGroup("LibreOffice", "repair");
+        addEndpointToGroup("LibreOffice", "file-to-pdf");
+        addEndpointToGroup("LibreOffice", "xlsx-to-pdf");
+        addEndpointToGroup("LibreOffice", "pdf-to-word");
+        addEndpointToGroup("LibreOffice", "pdf-to-presentation");
+        addEndpointToGroup("LibreOffice", "pdf-to-text");
+        addEndpointToGroup("LibreOffice", "pdf-to-html");
+        addEndpointToGroup("LibreOffice", "pdf-to-xml");
+        
+        
+        //OCRmyPDF
+        addEndpointToGroup("OCRmyPDF", "compress-pdf");
+        addEndpointToGroup("OCRmyPDF", "pdf-to-pdfa");
+        addEndpointToGroup("OCRmyPDF", "ocr-pdf");
+        
+        //Java
+        addEndpointToGroup("Java", "merge-pdfs");
+        addEndpointToGroup("Java", "remove-pages");
+        addEndpointToGroup("Java", "split-pdfs");
+        addEndpointToGroup("Java", "pdf-organizer");
+        addEndpointToGroup("Java", "rotate-pdf");
+        addEndpointToGroup("Java", "pdf-to-img");
+        addEndpointToGroup("Java", "img-to-pdf");
+        addEndpointToGroup("Java", "add-password");
+        addEndpointToGroup("Java", "remove-password");
+        addEndpointToGroup("Java", "change-permissions");
+        addEndpointToGroup("Java", "add-watermark");
+        addEndpointToGroup("Java", "add-image");
+        addEndpointToGroup("Java", "extract-images");
+        addEndpointToGroup("Java", "change-metadata");
+        addEndpointToGroup("Java", "cert-sign");
+        addEndpointToGroup("Java", "multi-page-layout");
+        addEndpointToGroup("Java", "scale-pages");
+        addEndpointToGroup("Java", "add-page-numbers");
+        addEndpointToGroup("Java", "auto-rename");
+        addEndpointToGroup("Java", "auto-split-pdf");
+        addEndpointToGroup("Java", "sanitize-pdf");
+        addEndpointToGroup("Java", "crop");
+        addEndpointToGroup("Java", "get-info-on-pdf");
+        addEndpointToGroup("Java", "extract-page");
+        addEndpointToGroup("Java", "pdf-to-single-page");
+        addEndpointToGroup("Java", "markdown-to-pdf");
+        addEndpointToGroup("Java", "show-javascript");
+        
+        //Javascript
+        addEndpointToGroup("Javascript", "pdf-organizer");
+        addEndpointToGroup("Javascript", "sign");
+        addEndpointToGroup("Javascript", "compare");
+        addEndpointToGroup("Javascript", "adjust-contrast");
+        
+        
+    }
+    
+    private void processEnvironmentConfigs() {
+        List<String> endpointsToRemove = applicationProperties.getEndpoints().getToRemove();
+        List<String> groupsToRemove = applicationProperties.getEndpoints().getGroupsToRemove();
+
+        if (endpointsToRemove != null) {
+            for (String endpoint : endpointsToRemove) {
+                disableEndpoint(endpoint.trim());
+            }
+        }
+
+        if (groupsToRemove != null) {
+            for (String group : groupsToRemove) {
+                disableGroup(group.trim());
+            }
+        }
+    }
+
+}
+
--- a/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
+++ b/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java
@@ -1,26 +1,26 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-@Component
-public class EndpointInterceptor implements HandlerInterceptor {
-
-    @Autowired
-    private EndpointConfiguration endpointConfiguration;
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-            throws Exception {
-        String requestURI = request.getRequestURI();
-        if (!endpointConfiguration.isEndpointEnabled(requestURI)) {
-            response.sendError(HttpServletResponse.SC_FORBIDDEN, "This endpoint is disabled");
-            return false;
-        }
-        return true;
-    }
+package stirling.software.SPDF.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class EndpointInterceptor implements HandlerInterceptor {
+
+    @Autowired
+    private EndpointConfiguration endpointConfiguration;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        String requestURI = request.getRequestURI();
+        if (!endpointConfiguration.isEndpointEnabled(requestURI)) {
+            response.sendError(HttpServletResponse.SC_FORBIDDEN, "This endpoint is disabled");
+            return false;
+        }
+        return true;
+    }
 }
--- a/src/main/java/stirling/software/SPDF/config/MetricsConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/MetricsConfig.java
@@ -1,24 +1,24 @@
-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;
-
-@Configuration
-public class MetricsConfig {
-
-    @Bean
-    public MeterFilter meterFilter() {
-        return new MeterFilter() {
-            @Override
-            public MeterFilterReply accept(Meter.Id id) {
-                if (id.getName().equals("http.requests")) {
-                    return MeterFilterReply.NEUTRAL;
-                }
-                return MeterFilterReply.DENY;
-            }
-        };
-    }
+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;
+
+@Configuration
+public class MetricsConfig {
+
+    @Bean
+    public MeterFilter meterFilter() {
+        return new MeterFilter() {
+            @Override
+            public MeterFilterReply accept(Meter.Id id) {
+                if (id.getName().equals("http.requests")) {
+                    return MeterFilterReply.NEUTRAL;
+                }
+                return MeterFilterReply.DENY;
+            }
+        };
+    }
 }
--- a/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/MetricsFilter.java
@@ -1,48 +1,48 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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;
-
-@Component
-public class MetricsFilter extends OncePerRequestFilter {
-
-    private final MeterRegistry meterRegistry;
-
-    @Autowired
-    public MetricsFilter(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-    }
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        String uri = request.getRequestURI();
-        
-        //System.out.println("uri="+uri + ", method=" + request.getMethod() );
-        // Ignore static resources
-        if (!(uri.startsWith("/js") || uri.startsWith("/images") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
-            Counter counter = Counter.builder("http.requests")
-                    .tag("uri", uri)
-                    .tag("method", request.getMethod())
-                    .register(meterRegistry);
-
-            counter.increment();
-            //System.out.println("Counted");
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-    
-
-}
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@Component
+public class MetricsFilter extends OncePerRequestFilter {
+
+    private final MeterRegistry meterRegistry;
+
+    @Autowired
+    public MetricsFilter(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        String uri = request.getRequestURI();
+        
+        //System.out.println("uri="+uri + ", method=" + request.getMethod() );
+        // Ignore static resources
+        if (!(uri.startsWith("/js") || uri.startsWith("api-docs") || uri.endsWith("robots.txt") || uri.startsWith("/images") || uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
+            Counter counter = Counter.builder("http.requests")
+                    .tag("uri", uri)
+                    .tag("method", request.getMethod())
+                    .register(meterRegistry);
+
+            counter.increment();
+            //System.out.println("Counted");
+        }
+
+        filterChain.doFilter(request, response);
+    }
+
+    
+
+}
--- a/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -1,36 +1,36 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-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.Info;
-
-@Configuration
-public class OpenApiConfig {
-
-	@Bean
-	public OpenAPI customOpenAPI() {
-	    String version = getClass().getPackage().getImplementationVersion();
-	    if (version == null) {
-	        Properties props = new Properties();
-	        try (InputStream input = getClass().getClassLoader().getResourceAsStream("version.properties")) {
-	            props.load(input);
-	            version = props.getProperty("version");
-	        } catch (IOException ex) {
-	            ex.printStackTrace();
-	            version = "1.0.0"; // default version if all else fails
-	        }
-	    }
-
-	    return new OpenAPI().components(new Components()).info(
-	            new Info().title("Stirling PDF API").version(version).description("API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
-	}
-
-
-}
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+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.Info;
+
+@Configuration
+public class OpenApiConfig {
+
+	@Bean
+	public OpenAPI customOpenAPI() {
+	    String version = getClass().getPackage().getImplementationVersion();
+	    if (version == null) {
+	        Properties props = new Properties();
+	        try (InputStream input = getClass().getClassLoader().getResourceAsStream("version.properties")) {
+	            props.load(input);
+	            version = props.getProperty("version");
+	        } catch (IOException ex) {
+	            ex.printStackTrace();
+	            version = "1.0.0"; // default version if all else fails
+	        }
+	    }
+
+	    return new OpenAPI().components(new Components()).info(
+	            new Info().title("Stirling PDF API").version(version).description("API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+	}
+
+
+}
--- a/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java
+++ b/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java
@@ -0,0 +1,20 @@
+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;
+
+@Component
+public class StartupApplicationListener implements ApplicationListener<ContextRefreshedEvent> {
+
+    public static LocalDateTime startTime;
+
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        startTime = LocalDateTime.now();
+    }
+}
+ 
--- a/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
+++ b/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
@@ -1,18 +1,27 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
-
-    @Autowired
-    private EndpointInterceptor endpointInterceptor;
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(endpointInterceptor);
-    }
-}
+package stirling.software.SPDF.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@Configuration
+public class WebMvcConfig implements WebMvcConfigurer {
+
+    @Autowired
+    private EndpointInterceptor endpointInterceptor;
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(endpointInterceptor);
+    }
+    
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // Handler for external static resources
+        registry.addResourceHandler("/**")
+                .addResourceLocations("file:customFiles/static/", "classpath:/static/");
+                //.setCachePeriod(0); // Optional: disable caching
+    }
+}
--- a/src/main/java/stirling/software/SPDF/config/YamlPropertySourceFactory.java
+++ b/src/main/java/stirling/software/SPDF/config/YamlPropertySourceFactory.java
@@ -0,0 +1,23 @@
+package stirling.software.SPDF.config;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.EncodedResource;
+import org.springframework.core.io.support.PropertySourceFactory;
+public class YamlPropertySourceFactory implements PropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) 
+      throws IOException {
+        YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+        factory.setResources(encodedResource.getResource());
+
+        Properties properties = factory.getObject();
+
+        return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties);
+    }
+}
--- a/src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java
+++ b/src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java
@@ -0,0 +1,26 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) 
+      throws IOException, ServletException {
+        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+        	setDefaultFailureUrl("/login?error=badcredentials");
+        } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+        	setDefaultFailureUrl("/login?error=locked");
+        }
+        super.onAuthenticationFailure(request, response, exception);
+    }
+}
--- a/src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java
@@ -0,0 +1,45 @@
+package stirling.software.SPDF.config.security;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+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 stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+
+@Service
+public class CustomUserDetailsService implements UserDetailsService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+   
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("No user found with username: " + username));
+
+        return new org.springframework.security.core.userdetails.User(
+            user.getUsername(),
+            user.getPassword(),
+            user.isEnabled(),
+            true, true, true,
+            getAuthorities(user.getAuthorities())
+        );
+    }
+
+    private Collection<? extends GrantedAuthority> getAuthorities(Set<Authority> authorities) {
+        return authorities.stream()
+            .map(authority -> new SimpleGrantedAuthority(authority.getAuthority()))
+            .collect(Collectors.toList());
+    }
+}
--- a/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
+++ b/src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
@@ -0,0 +1,79 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import jakarta.annotation.PostConstruct;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.Role;
+
+@Component
+public class InitialSecuritySetup {
+
+	@Autowired
+	private UserService userService;
+
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+	@PostConstruct
+	public void init() {
+		if (!userService.hasUsers()) {
+			String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername();
+			String initialPassword = applicationProperties.getSecurity().getInitialLogin().getPassword();
+			if (initialUsername != null && initialPassword != null) {
+				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
+			}
+
+		}
+	}
+
+
+
+	@PostConstruct
+	public void initSecretKey() throws IOException {
+		String secretKey = applicationProperties.getAutomaticallyGenerated().getKey();
+		if (secretKey == null || secretKey.isEmpty()) {
+			secretKey = UUID.randomUUID().toString(); // Generating a random UUID as the secret key
+			saveKeyToConfig(secretKey);
+		}
+	}
+
+	private void saveKeyToConfig(String key) throws IOException {
+		Path path = Paths.get("configs", "settings.yml"); // Target the configs/settings.yml
+		List<String> lines = Files.readAllLines(path);
+		boolean keyFound = false;
+
+		// Search for the existing key to replace it or place to add it
+		for (int i = 0; i < lines.size(); i++) {
+			if (lines.get(i).startsWith("AutomaticallyGenerated:")) {
+				keyFound = true;
+				if (i + 1 < lines.size() && lines.get(i + 1).trim().startsWith("key:")) {
+					lines.set(i + 1, "  key: " + key);
+					break;
+				} else {
+					lines.add(i + 1, "  key: " + key);
+					break;
+				}
+			}
+		}
+
+		// If the section doesn't exist, append it
+		if (!keyFound) {
+			lines.add("# Automatically Generated Settings (Do Not Edit Directly)");
+			lines.add("AutomaticallyGenerated:");
+			lines.add("  key: " + key);
+		}
+
+		// Write back to the file
+		Files.write(path, lines);
+	}
+}
--- a/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
+++ b/src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
@@ -0,0 +1,103 @@
+package stirling.software.SPDF.config.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
+@Configuration
+@EnableWebSecurity()
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class SecurityConfiguration {
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+    @Autowired
+    @Lazy
+    private UserService userService;
+    
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
+    
+    @Autowired
+    private UserAuthenticationFilter userAuthenticationFilter;
+    
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception  {
+    	http.addFilterBefore(userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+        
+    	if(loginEnabledValue) {
+    		
+    		http.csrf(csrf -> csrf.disable());
+	        http
+	            .formLogin(formLogin -> formLogin
+	                .loginPage("/login")
+	                .defaultSuccessUrl("/")
+	                .failureHandler(new CustomAuthenticationFailureHandler())
+	                .permitAll()
+	            )
+	            .logout(logout -> logout
+	            		.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
+	                    .logoutSuccessUrl("/login?logout=true")
+	                    .invalidateHttpSession(true)        // Invalidate session
+	                    .deleteCookies("JSESSIONID", "remember-me") 
+	            ).rememberMe(rememberMeConfigurer -> rememberMeConfigurer // Use the configurator directly
+                    .key("uniqueAndSecret")
+                    .tokenRepository(persistentTokenRepository())
+                    .tokenValiditySeconds(1209600) // 2 weeks
+                )
+	            .authorizeHttpRequests(authz -> authz
+	                    .requestMatchers(req -> req.getRequestURI().startsWith("/login") || req.getRequestURI().endsWith(".svg") || req.getRequestURI().startsWith("/register") || req.getRequestURI().startsWith("/error") || req.getRequestURI().startsWith("/images/") ||  req.getRequestURI().startsWith("/public/") || req.getRequestURI().startsWith("/css/") || req.getRequestURI().startsWith("/js/"))
+	                    .permitAll()
+	                    .anyRequest().authenticated()
+	                )
+	            .userDetailsService(userDetailsService)
+	            .authenticationProvider(authenticationProvider());
+    	} else {
+    		 http.csrf(csrf -> csrf.disable())
+             .authorizeHttpRequests(authz -> authz
+                 .anyRequest().permitAll()
+             );
+    	}
+        return http.build();
+    }
+
+
+    
+    @Bean
+    public DaoAuthenticationProvider authenticationProvider() {
+        DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider();
+        authProvider.setUserDetailsService(userDetailsService);
+        authProvider.setPasswordEncoder(passwordEncoder());
+        return authProvider;
+    }
+    
+    @Bean
+    public PersistentTokenRepository persistentTokenRepository() {
+        return new JPATokenRepositoryImpl();
+    }
+    
+
+    
+}
+
--- a/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java
@@ -0,0 +1,112 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+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 stirling.software.SPDF.model.ApiKeyAuthenticationToken;
+@Component
+public class UserAuthenticationFilter extends OncePerRequestFilter {
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Autowired
+    @Lazy
+    private UserService userService;
+    
+   
+    @Autowired
+    @Qualifier("loginEnabled")
+    public boolean loginEnabledValue;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+
+        if (!loginEnabledValue) {
+            // If login is not enabled, just pass all requests without authentication
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        // Check for API key in the request headers if no authentication exists
+        if (authentication == null || !authentication.isAuthenticated()) {
+            String apiKey = request.getHeader("X-API-Key");
+            if (apiKey != null && !apiKey.trim().isEmpty()) {
+                try {
+                    // Use API key to authenticate. This requires you to have an authentication provider for API keys.
+                	UserDetails userDetails = userService.loadUserByApiKey(apiKey);
+                	if(userDetails == null)
+                	{
+                		response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                        response.getWriter().write("Invalid API Key.");
+                        return;
+                	}
+                    authentication = new ApiKeyAuthenticationToken(userDetails, apiKey, userDetails.getAuthorities());
+                    SecurityContextHolder.getContext().setAuthentication(authentication);
+                } catch (AuthenticationException e) {
+                    // If API key authentication fails, deny the request
+                    response.setStatus(HttpStatus.UNAUTHORIZED.value());
+                    response.getWriter().write("Invalid API Key.");
+                    return;
+                }
+            }
+        }
+
+        // If we still don't have any authentication, deny the request
+        if (authentication == null || !authentication.isAuthenticated()) {
+        	String method = request.getMethod();
+        	if ("GET".equalsIgnoreCase(method)) {
+        		 response.sendRedirect("/login");  // redirect to the login page
+        	     return;
+            }
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+            response.getWriter().write("Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternativly you can disable authentication if this is unexpected");
+            return;
+        }
+
+        filterChain.doFilter(request, response);
+    }
+    
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+        String uri = request.getRequestURI();
+
+        String[] permitAllPatterns = {
+            "/login",
+            "/register",
+            "/error",
+            "/images/",
+            "/public/",
+            "/css/",
+            "/js/"
+        };
+
+        for (String pattern : permitAllPatterns) {
+            if (uri.startsWith(pattern) || uri.endsWith(".svg")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+}
--- a/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserBasedRateLimitingFilter.java
@@ -0,0 +1,125 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+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.bucket4j.Refill;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.model.Role;
+@Component
+public class UserBasedRateLimitingFilter extends OncePerRequestFilter {
+
+	private final Map<String, Bucket> apiBuckets = new ConcurrentHashMap<>();
+    private final Map<String, Bucket> webBuckets = new ConcurrentHashMap<>();
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
+    @Autowired
+    @Qualifier("rateLimit")
+    public boolean rateLimit;
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request,
+                                    HttpServletResponse response,
+                                    FilterChain filterChain) throws ServletException, IOException {
+        if (!rateLimit) {
+            // If rateLimit is not enabled, just pass all requests without rate limiting
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        String method = request.getMethod();
+        if (!"POST".equalsIgnoreCase(method)) {
+            // If the request is not a POST, just pass it through without rate limiting
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        String identifier = null;
+
+        // Check for API key in the request headers
+        String apiKey = request.getHeader("X-API-Key");
+        if (apiKey != null && !apiKey.trim().isEmpty()) {
+            identifier = "API_KEY_" + apiKey; // Prefix to distinguish between API keys and usernames
+        } else {
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+            if (authentication != null && authentication.isAuthenticated()) {
+                UserDetails userDetails = (UserDetails) authentication.getPrincipal();
+                identifier = userDetails.getUsername();
+            }
+        }
+
+        // If neither API key nor an authenticated user is present, use IP address
+        if (identifier == null) {
+            identifier = request.getRemoteAddr();
+        }
+
+        Role userRole = getRoleFromAuthentication(SecurityContextHolder.getContext().getAuthentication());
+
+        if (request.getHeader("X-API-Key") != null) {
+            // It's an API call
+            processRequest(userRole.getApiCallsPerDay(), identifier, apiBuckets, request, response, filterChain);
+        } else {
+            // It's a Web UI call
+            processRequest(userRole.getWebCallsPerDay(), identifier, webBuckets, request, response, filterChain);
+        }
+    }
+
+    private Role getRoleFromAuthentication(Authentication authentication) {
+        if (authentication != null && authentication.isAuthenticated()) {
+            for (GrantedAuthority authority : authentication.getAuthorities()) {
+                try {
+                    return Role.fromString(authority.getAuthority());
+                } catch (IllegalArgumentException ex) {
+                    // Ignore and continue to next authority.
+                }
+            }
+        }
+        throw new IllegalStateException("User does not have a valid role.");
+    }
+
+    private void processRequest(int limitPerDay, String identifier, Map<String, Bucket> buckets,
+                                HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws IOException, ServletException {
+        Bucket userBucket = buckets.computeIfAbsent(identifier, k -> createUserBucket(limitPerDay));
+        ConsumptionProbe probe = userBucket.tryConsumeAndReturnRemaining(1);
+
+        if (probe.isConsumed()) {
+            response.setHeader("X-Rate-Limit-Remaining", Long.toString(probe.getRemainingTokens()));
+            filterChain.doFilter(request, response);
+        } else {
+            long waitForRefill = probe.getNanosToWaitForRefill() / 1_000_000_000;
+            response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
+            response.setHeader("X-Rate-Limit-Retry-After-Seconds", String.valueOf(waitForRefill));
+            response.getWriter().write("Rate limit exceeded for POST requests.");
+        }
+    }
+
+    private Bucket createUserBucket(int limitPerDay) {
+        Bandwidth limit = Bandwidth.classic(limitPerDay, Refill.intervally(limitPerDay, Duration.ofDays(1)));
+        return Bucket.builder().addLimit(limit).build();
+    }
+}
+
+
+
--- a/src/main/java/stirling/software/SPDF/config/security/UserService.java
+++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java
@@ -0,0 +1,174 @@
+package stirling.software.SPDF.config.security;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+@Service
+public class UserService {
+    
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    public Authentication getAuthentication(String apiKey) {
+        User user = getUserByApiKey(apiKey);
+        if (user == null) {
+            throw new UsernameNotFoundException("API key is not valid");
+        }
+        
+        // Convert the user into an Authentication object
+        return new UsernamePasswordAuthenticationToken(
+            user,                       // principal (typically the user)
+            null,                       // credentials (we don't expose the password or API key here)
+            getAuthorities(user)        // user's authorities (roles/permissions)
+        );
+    }
+    
+    private Collection<? extends GrantedAuthority> getAuthorities(User user) {
+        // Convert each Authority object into a SimpleGrantedAuthority object.
+    	return user.getAuthorities().stream()
+    		    .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority()))
+    		    .collect(Collectors.toList());
+
+
+    }
+    
+    private String generateApiKey() {
+        String apiKey;
+        do {
+            apiKey = UUID.randomUUID().toString();
+        } while (userRepository.findByApiKey(apiKey) != null); // Ensure uniqueness
+        return apiKey;
+    }
+
+    public User addApiKeyToUser(String username) {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+        
+        user.setApiKey(generateApiKey());
+        return userRepository.save(user);
+    }
+
+    public User refreshApiKeyForUser(String username) {
+        return addApiKeyToUser(username); // reuse the add API key method for refreshing
+    }
+
+    public String getApiKeyForUser(String username) {
+        User user = userRepository.findByUsername(username)
+            .orElseThrow(() -> new UsernameNotFoundException("User not found"));
+        return user.getApiKey();
+    }
+
+    public boolean isValidApiKey(String apiKey) {
+        return userRepository.findByApiKey(apiKey) != null;
+    }
+
+    public User getUserByApiKey(String apiKey) {
+        return userRepository.findByApiKey(apiKey);
+    }
+    
+    public UserDetails loadUserByApiKey(String apiKey) {
+        User userOptional = userRepository.findByApiKey(apiKey);
+        if (userOptional != null) {
+            User user = userOptional;
+            // Convert your User entity to a UserDetails object with authorities
+            return new org.springframework.security.core.userdetails.User(
+                user.getUsername(),
+                user.getPassword(), // you might not need this for API key auth
+                getAuthorities(user)
+            );
+        }
+        return null;  // or throw an exception
+    }
+    
+
+    public boolean validateApiKeyForUser(String username, String apiKey) {
+        Optional<User> userOpt = userRepository.findByUsername(username);
+        return userOpt.isPresent() && userOpt.get().getApiKey().equals(apiKey);
+    }
+    
+    public void saveUser(String username, String password) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.setEnabled(true);
+        userRepository.save(user);
+    }
+
+    public void saveUser(String username, String password, String role) {
+        User user = new User();
+        user.setUsername(username);
+        user.setPassword(passwordEncoder.encode(password));
+        user.addAuthority(new Authority(role, user));
+        user.setEnabled(true);
+        userRepository.save(user);
+    }
+    
+    public void deleteUser(String username) {
+    	 Optional<User> userOpt = userRepository.findByUsername(username);
+         if (userOpt.isPresent()) {
+        	 userRepository.delete(userOpt.get());
+         }
+    }
+    
+    public boolean usernameExists(String username) {
+        return userRepository.findByUsername(username).isPresent();
+    }
+    
+    public boolean hasUsers() {
+        return userRepository.count() > 0;
+    }
+    
+    public void updateUserSettings(String username, Map<String, String> updates) {
+        Optional<User> userOpt = userRepository.findByUsername(username);
+        if (userOpt.isPresent()) {
+            User user = userOpt.get();
+            Map<String, String> settingsMap = user.getSettings();
+
+            if(settingsMap == null) {
+                settingsMap = new HashMap<String,String>();
+            } 
+            settingsMap.clear();
+            settingsMap.putAll(updates);
+            user.setSettings(settingsMap);
+
+            userRepository.save(user);
+        } 
+    }
+
+    public Optional<User> findByUsername(String username) {
+        return userRepository.findByUsername(username);
+    }
+
+    public void changeUsername(User user, String newUsername) {
+        user.setUsername(newUsername);
+        userRepository.save(user);
+    }
+
+    public void changePassword(User user, String newPassword) {
+        user.setPassword(passwordEncoder.encode(newPassword));
+        userRepository.save(user);
+    }
+    
+    public boolean isPasswordCorrect(User user, String currentPassword) {
+        return passwordEncoder.matches(currentPassword, user.getPassword());
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/CropController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/CropController.java
@@ -0,0 +1,78 @@
+package stirling.software.SPDF.controller.api;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfPage;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "General", description = "General APIs")
+public class CropController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+
+
+	@PostMapping(value = "/crop", consumes = "multipart/form-data")
+	@Operation(summary = "Crops a PDF document", description = "This operation takes an input PDF file and crops it according to the given coordinates. Input:PDF Output:PDF Type:SISO")
+	public ResponseEntity<byte[]> cropPdf(
+	        @Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
+	        @Parameter(description = "The x-coordinate of the top-left corner of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("x") float x,
+	        @Parameter(description = "The y-coordinate of the top-left corner of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("y") float y,
+	        @Parameter(description = "The width of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("width") float width,
+	        @Parameter(description = "The height of the crop area", required = true, schema = @Schema(type = "number")) @RequestParam("height") float height) throws IOException {
+	    byte[] bytes = file.getBytes();
+	    System.out.println("x=" + x + ", " + "y=" + y + ", " + "width=" + width + ", " +"height=" + height  );
+	    PdfReader reader = new PdfReader(new ByteArrayInputStream(bytes));
+	    PdfDocument pdfDoc = new PdfDocument(reader);
+	
+	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	    PdfWriter writer = new PdfWriter(baos);
+	    PdfDocument outputPdf = new PdfDocument(writer);
+	
+	    int totalPages = pdfDoc.getNumberOfPages();
+	
+	    for (int i = 1; i <= totalPages; i++) {
+	        PdfPage page = outputPdf.addNewPage(new PageSize(width, height));
+	        PdfCanvas pdfCanvas = new PdfCanvas(page);
+
+	        PdfFormXObject formXObject = pdfDoc.getPage(i).copyAsFormXObject(outputPdf);
+
+	        // Save the graphics state, apply the transformations, add the object, and then
+	        // restore the graphics state
+	        pdfCanvas.saveState();
+	        pdfCanvas.rectangle(x, y, width, height);
+	        pdfCanvas.clip();
+	        pdfCanvas.addXObject(formXObject, -x, -y);
+	        pdfCanvas.restoreState();
+	    }
+	
+
+	    outputPdf.close();
+		byte[] pdfContent = baos.toByteArray();
+		pdfDoc.close();
+		return WebResponseUtils.bytesToWebResponse(pdfContent,
+				file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_cropped.pdf");
+	}
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/MergeController.java
@@ -1,22 +1,29 @@
 package stirling.software.SPDF.controller.api;

 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;

 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 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.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.WebResponseUtils;

@@ -26,55 +33,93 @@ public class MergeController {

    private static final Logger logger = LoggerFactory.getLogger(MergeController.class);

-    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-        // Create a new empty document
-        PDDocument mergedDoc = new PDDocument();

-        // Iterate over the list of documents and add their pages to the merged document
-        for (PDDocument doc : documents) {
-            // Get all pages from the current document
-            PDPageTree pages = doc.getPages();
-            // Iterate over the pages and add them to the merged document
-            for (PDPage page : pages) {
-                mergedDoc.addPage(page);
-            }
-            
-            
+private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+	PDDocument mergedDoc = new PDDocument();
+    for (PDDocument doc : documents) {
+        for (PDPage page : doc.getPages()) {
+            mergedDoc.addPage(page);
        }
+    }
+    return mergedDoc;
+}

-        // Return the merged document
-        return mergedDoc;
+private Comparator<MultipartFile> getSortComparator(String sortType) {
+    switch (sortType) {
+        case "byFileName":
+            return Comparator.comparing(MultipartFile::getOriginalFilename);
+        case "byDateModified":
+            return (file1, file2) -> {
+                try {
+                    BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                    BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                    return attr1.lastModifiedTime().compareTo(attr2.lastModifiedTime());
+                } catch (IOException e) {
+                    return 0;  // If there's an error, treat them as equal
+                }
+            };
+        case "byDateCreated":
+            return (file1, file2) -> {
+                try {
+                    BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                    BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                    return attr1.creationTime().compareTo(attr2.creationTime());
+                } catch (IOException e) {
+                    return 0;  // If there's an error, treat them as equal
+                }
+            };
+        case "byPDFTitle":
+            return (file1, file2) -> {
+                try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
+                     PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
+                    String title1 = doc1.getDocumentInformation().getTitle();
+                    String title2 = doc2.getDocumentInformation().getTitle();
+                    return title1.compareTo(title2);
+                } catch (IOException e) {
+                    return 0;
+                }
+            };
+        case "orderProvided":
+        default:
+            return (file1, file2) -> 0;  // Default is the order provided
+    }
+}
+
+@PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
+@Operation(summary = "Merge multiple PDF files into one",
+        description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO")
+public ResponseEntity<byte[]> mergePdfs(
+        @RequestPart(required = true, value = "fileInput") MultipartFile[] files,
+        @RequestParam(value = "sortType", defaultValue = "orderProvided") 
+        @Parameter(schema = @Schema(description = "The type of sorting to be applied on the input files before merging.",
+                        allowableValues = {
+                            "orderProvided", 
+                            "byFileName", 
+                            "byDateModified", 
+                            "byDateCreated", 
+                            "byPDFTitle"
+                        }))
+        String sortType) throws IOException {
+
+    Arrays.sort(files, getSortComparator(sortType));
+
+    List<PDDocument> documents = new ArrayList<>();
+    for (MultipartFile file : files) {
+        try (InputStream is = file.getInputStream()) {
+            documents.add(PDDocument.load(is));
+        }
    }

-    @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
-    @Operation(
-        summary = "Merge multiple PDF files into one",
-        description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO"
-    )
-    public ResponseEntity<byte[]> mergePdfs(
-        @RequestPart(required = true, value = "fileInput")
-        @Parameter(description = "The input PDF files to be merged into a single file", required = true)
-            MultipartFile[] files) throws IOException {
-    	// Read the input PDF files into PDDocument objects
-        List<PDDocument> documents = new ArrayList<>();
-
-        // Loop through the files array and read each file into a PDDocument
-        for (MultipartFile file : files) {
-            documents.add(PDDocument.load(file.getInputStream()));
-        }
-
-        PDDocument mergedDoc = mergeDocuments(documents);
-
-        
-        // Return the merged PDF as a response
+    try (PDDocument mergedDoc = mergeDocuments(documents)) {
        ResponseEntity<byte[]> response = WebResponseUtils.pdfDocToWebResponse(mergedDoc, files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
-        
-        for (PDDocument doc : documents) {
-            // Close the document after processing
-            doc.close();
-           }
-        
        return response;
+    } finally {
+        for (PDDocument doc : documents) {
+            if (doc != null) {
+                doc.close();
+            }
+        }
    }
+}

 }
--- a/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java
@@ -52,11 +52,11 @@ public class ScalePagesController {
 	@Operation(summary = "Change the size of a PDF page/document", description = "This operation takes an input PDF file and the size to scale the pages to in the output PDF file. Input:PDF Output:PDF Type:SISO")
 	public ResponseEntity<byte[]> scalePages(
 			@Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
-			@Parameter(description = "The scale of pages in the output PDF. Acceptable values are A0-A10, B0-B9, LETTER, TABLOID, LEDGER, LEGAL, EXECUTIVE.", required = true, schema = @Schema(type = "String", allowableValues = {
+			@Parameter(description = "The scale of pages in the output PDF. Acceptable values are A0-A10, B0-B9, LETTER, TABLOID, LEDGER, LEGAL, EXECUTIVE.", required = true, schema = @Schema(type = "string", allowableValues = {
 					"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10", "B0", "B1", "B2", "B3", "B4",
 					"B5", "B6", "B7", "B8", "B9", "LETTER", "TABLOID", "LEDGER", "LEGAL",
 					"EXECUTIVE" })) @RequestParam("pageSize") String targetPageSize,
-			@Parameter(description = "The scale of the content on the pages of the output PDF. Acceptable values are floats.", required = true, schema = @Schema(type = "float")) @RequestParam("scaleFactor") float scaleFactor)
+			@Parameter(description = "The scale of the content on the pages of the output PDF. Acceptable values are floats.", required = true, schema = @Schema(type = "integer")) @RequestParam("scaleFactor") float scaleFactor)
 			throws IOException {

 		Map<String, PageSize> sizeMap = new HashMap<>();
--- a/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java
@@ -0,0 +1,80 @@
+package stirling.software.SPDF.controller.api;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.itextpdf.kernel.geom.PageSize;
+import com.itextpdf.kernel.geom.Rectangle;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
+import com.itextpdf.layout.Document;
+import com.itextpdf.layout.element.Image;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@Tag(name = "General", description = "General APIs")
+public class ToSinglePageController {
+
+    private static final Logger logger = LoggerFactory.getLogger(ToSinglePageController.class);
+
+   
+    @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
+    @Operation(
+        summary = "Convert a multi-page PDF into a single long page PDF",
+        description = "This endpoint converts a multi-page PDF document into a single paged PDF document. The width of the single page will be same as the input's width, but the height will be the sum of all the pages' heights. Input:PDF Output:PDF Type:SISO"
+    )
+    public ResponseEntity<byte[]> pdfToSinglePage(
+        @RequestPart(required = true, value = "fileInput")
+        @Parameter(description = "The input multi-page PDF file to be converted into a single page", required = true)
+            MultipartFile file) throws IOException {
+
+        PdfReader reader = new PdfReader(file.getInputStream());
+        PdfDocument sourceDocument = new PdfDocument(reader);
+        
+        float totalHeight = 0;
+        float width = 0;
+
+        for (int i = 1; i <= sourceDocument.getNumberOfPages(); i++) {
+            Rectangle pageSize = sourceDocument.getPage(i).getPageSize();
+            totalHeight += pageSize.getHeight();
+            if(width < pageSize.getWidth())
+            	width = pageSize.getWidth();
+        }
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfWriter writer = new PdfWriter(baos);
+        PdfDocument newDocument = new PdfDocument(writer);
+        PageSize newPageSize = new PageSize(width, totalHeight);
+        newDocument.addNewPage(newPageSize);
+
+        Document layoutDoc = new Document(newDocument);
+        float yOffset = totalHeight;
+
+        for (int i = 1; i <= sourceDocument.getNumberOfPages(); i++) {
+            PdfFormXObject pageCopy = sourceDocument.getPage(i).copyAsFormXObject(newDocument);
+            Image copiedPage = new Image(pageCopy);
+            copiedPage.setFixedPosition(0, yOffset - sourceDocument.getPage(i).getPageSize().getHeight());
+            yOffset -= sourceDocument.getPage(i).getPageSize().getHeight();
+            layoutDoc.add(copiedPage);
+        }
+
+        layoutDoc.close();
+        sourceDocument.close();
+
+        byte[] result = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(result, file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_singlePage.pdf");
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java
@@ -0,0 +1,158 @@
+package stirling.software.SPDF.controller.api;
+
+import java.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.User;
+
+@Controller
+public class UserController {
+    
+    @Autowired
+    private UserService userService;
+    
+    @PostMapping("/register")
+    public String register(@RequestParam String username, @RequestParam String password, Model model) {
+        if(userService.usernameExists(username)) {
+            model.addAttribute("error", "Username already exists");
+            return "register";
+        }
+
+        userService.saveUser(username, password);
+        return "redirect:/login?registered=true";
+    }
+    
+    @PostMapping("/change-username")
+    public ResponseEntity<String> changeUsername(Principal principal, @RequestParam String currentPassword, @RequestParam String newUsername, HttpServletRequest request, HttpServletResponse response) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+        
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
+        
+        if(userOpt == null || userOpt.isEmpty()) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found.");
+        }
+        User user = userOpt.get();
+        
+        if(!userService.isPasswordCorrect(user, currentPassword)) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("Current password is incorrect.");
+        }
+        
+        if(userService.usernameExists(newUsername)) {
+            return ResponseEntity.status(HttpStatus.CONFLICT).body("New username already exists.");
+        }
+
+        userService.changeUsername(user, newUsername);
+
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+
+        
+        return ResponseEntity.ok("Username updated successfully.");
+    }
+
+    @PostMapping("/change-password")
+    public ResponseEntity<String> changePassword(Principal principal, @RequestParam String currentPassword, @RequestParam String newPassword, HttpServletRequest request, HttpServletResponse response) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+
+        Optional<User> userOpt = userService.findByUsername(principal.getName());
+        
+        if(userOpt == null || userOpt.isEmpty()) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found.");
+        }
+        User user = userOpt.get();
+        if(!userService.isPasswordCorrect(user, currentPassword)) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("Current password is incorrect.");
+        }
+
+        userService.changePassword(user, newPassword);
+
+        // Logout using Spring's utility
+        new SecurityContextLogoutHandler().logout(request, response, null);
+        
+        return ResponseEntity.ok("Password updated successfully.");
+    }
+    
+    @PostMapping("/updateUserSettings")
+	public String updateUserSettings(HttpServletRequest request, Principal principal) {
+	    Map<String, String[]> paramMap = request.getParameterMap();
+	    Map<String, String> updates = new HashMap<>();
+
+	    System.out.println("Received parameter map: " + paramMap);
+
+	    for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
+	        updates.put(entry.getKey(), entry.getValue()[0]);
+	    }
+
+	    System.out.println("Processed updates: " + updates);
+
+	    // Assuming you have a method in userService to update the settings for a user
+	    userService.updateUserSettings(principal.getName(), updates);
+
+	    return "redirect:/account";  // Redirect to a page of your choice after updating
+	}
+
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @PostMapping("/admin/saveUser")
+    public String saveUser(@RequestParam String username, @RequestParam String password, @RequestParam String role) {
+        userService.saveUser(username, password, role);
+        return "redirect:/addUsers";  // Redirect to account page after adding the user
+    }
+
+    
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @GetMapping("/admin/deleteUser/{username}")
+    public String deleteUser(@PathVariable String username) {
+    	userService.deleteUser(username); 
+        return "redirect:/addUsers";
+    }
+    
+    @PostMapping("/get-api-key")
+    public ResponseEntity<String> getApiKey(Principal principal) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+        String username = principal.getName();
+        String apiKey = userService.getApiKeyForUser(username);
+        if (apiKey == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("API key not found for user.");
+        }
+        return ResponseEntity.ok(apiKey);
+    }
+
+    @PostMapping("/update-api-key")
+    public ResponseEntity<String> updateApiKey(Principal principal) {
+        if (principal == null) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User not authenticated.");
+        }
+        String username = principal.getName();
+        User user = userService.refreshApiKeyForUser(username);
+        String apiKey = user.getApiKey();
+        if (apiKey == null) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body("API key not found for user.");
+        }
+        return ResponseEntity.ok(apiKey);
+    }
+    
+    
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEpubToPdf.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEpubToPdf.java
@@ -0,0 +1,127 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.FileToPdf;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConvertEpubToPdf {
+	//TODO
+	@PostMapping(consumes = "multipart/form-data", value = "/epub-to-single-pdf")
+	@Hidden
+	@Operation(
+	    summary = "Convert an EPUB file to a single PDF",
+	    description = "This endpoint takes an EPUB file input and converts it to a single PDF."
+	)
+	public ResponseEntity<byte[]> epubToSinglePdf(
+	        @RequestPart(required = true, value = "fileInput") MultipartFile fileInput) 
+	        throws Exception {
+
+	    if (fileInput == null) {
+	        throw new IllegalArgumentException("Please provide an EPUB file for conversion.");
+	    }
+
+	    String originalFilename = fileInput.getOriginalFilename();
+	    if (originalFilename == null || !originalFilename.endsWith(".epub")) {
+	        throw new IllegalArgumentException("File must be in .epub format.");
+	    }
+
+	    Map<String, byte[]> epubContents = extractEpubContent(fileInput);
+	    List<String> htmlFilesOrder = getHtmlFilesOrderFromOpf(epubContents);
+
+	    List<byte[]> individualPdfs = new ArrayList<>();
+
+	    for (String htmlFile : htmlFilesOrder) {
+	        byte[] htmlContent = epubContents.get(htmlFile);
+	        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent, htmlFile.replace(".html", ".pdf"));
+	        individualPdfs.add(pdfBytes);
+	    }
+
+	    // Pseudo-code to merge individual PDFs into one.
+	    byte[] mergedPdfBytes = mergeMultiplePdfsIntoOne(individualPdfs);
+
+	    return WebResponseUtils.bytesToWebResponse(mergedPdfBytes, originalFilename.replace(".epub", ".pdf"));
+	}
+
+	// Assuming a pseudo-code function that merges multiple PDFs into one.
+	private byte[] mergeMultiplePdfsIntoOne(List<byte[]> individualPdfs) {
+	    // You can use a library such as iText or PDFBox to perform the merging here.
+	    // Return the byte[] of the merged PDF.
+		return null;
+	}
+	
+    private Map<String, byte[]> extractEpubContent(MultipartFile fileInput) throws IOException {
+        Map<String, byte[]> contentMap = new HashMap<>();
+
+        try (ZipInputStream zis = new ZipInputStream(fileInput.getInputStream())) {
+            ZipEntry zipEntry = zis.getNextEntry();
+            while (zipEntry != null) {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                byte[] buffer = new byte[1024];
+                int read = 0;
+                while ((read = zis.read(buffer)) != -1) {
+                    baos.write(buffer, 0, read);
+                }
+                contentMap.put(zipEntry.getName(), baos.toByteArray());
+                zipEntry = zis.getNextEntry();
+            }
+        }
+
+        return contentMap;
+    }
+
+    private List<String> getHtmlFilesOrderFromOpf(Map<String, byte[]> epubContents) throws Exception {
+        String opfContent = new String(epubContents.get("OEBPS/content.opf"));  // Adjusting for given path
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        InputSource is = new InputSource(new StringReader(opfContent));
+        Document doc = dBuilder.parse(is);
+
+        NodeList itemRefs = doc.getElementsByTagName("itemref");
+        List<String> htmlFilesOrder = new ArrayList<>();
+        
+        for (int i = 0; i < itemRefs.getLength(); i++) {
+            Element itemRef = (Element) itemRefs.item(i);
+            String idref = itemRef.getAttribute("idref");
+            
+            NodeList items = doc.getElementsByTagName("item");
+            for (int j = 0; j < items.getLength(); j++) {
+                Element item = (Element) items.item(j);
+                if (idref.equals(item.getAttribute("id"))) {
+                    htmlFilesOrder.add(item.getAttribute("href"));  // Fetching the actual href
+                    break;
+                }
+            }
+        }
+
+        return htmlFilesOrder;
+    }
+
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java
@@ -0,0 +1,49 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+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.SPDF.utils.FileToPdf;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConvertHtmlToPDF {
+
+
+	 @PostMapping(consumes = "multipart/form-data", value = "/html-to-pdf")
+	    @Operation(
+	        summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
+	        description = "This endpoint takes an HTML or ZIP file input and converts it to a PDF format."
+	    )
+	    public ResponseEntity<byte[]> HtmlToPdf(
+	            @RequestPart(required = true, value = "fileInput") MultipartFile fileInput) throws IOException, InterruptedException {
+
+	        if (fileInput == null) {
+	            throw new IllegalArgumentException("Please provide an HTML or ZIP file for conversion.");
+	        }
+
+	        String originalFilename = fileInput.getOriginalFilename();
+	        if (originalFilename == null || (!originalFilename.endsWith(".html") && !originalFilename.endsWith(".zip"))) {
+	            throw new IllegalArgumentException("File must be either .html or .zip format.");
+	        }byte[] pdfBytes = FileToPdf.convertHtmlToPdf( fileInput.getBytes(), originalFilename);
+	        
+	        String outputFilename = originalFilename.replaceFirst("[.][^.]+$", "") + ".pdf";  // Remove file extension and append .pdf
+	        
+	        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+	    }
+
+	   
+
+    
+   
+	    
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java
@@ -43,7 +43,7 @@ public class ConvertImgPDFController {
            @Parameter(description = "Choose between a single image containing all pages or separate images for each page", schema = @Schema(allowableValues = {"single", "multiple"}))
                    String singleOrMultiple,
            @RequestParam("colorType")
-            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"rgb", "greyscale", "blackwhite"}))
+            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"color", "greyscale", "blackwhite"}))
                    String colorType,
            @RequestParam("dpi")
            @Parameter(description = "The DPI (dots per inch) for the output image(s)")
@@ -94,7 +94,7 @@ public class ConvertImgPDFController {
            @Parameter(description = "Whether to stretch the images to fit the PDF page or maintain the aspect ratio", example = "false")
                    boolean stretchToFit,
            @RequestParam("colorType")
-            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"rgb", "greyscale", "blackwhite"}))
+            @Parameter(description = "The color type of the output image(s)", schema = @Schema(allowableValues = {"color", "greyscale", "blackwhite"}))
                    String colorType,
            @RequestParam(defaultValue = "false", name = "autoRotate")
            @Parameter(description = "Whether to automatically rotate the images to better fit the PDF page", example = "true")
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java
@@ -0,0 +1,52 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+
+import org.commonmark.node.Node;
+import org.commonmark.parser.Parser;
+import org.commonmark.renderer.html.HtmlRenderer;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+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.SPDF.utils.FileToPdf;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConvertMarkdownToPdf {
+	
+	@PostMapping(consumes = "multipart/form-data", value = "/markdown-to-pdf")
+    @Operation(
+        summary = "Convert a Markdown file to PDF",
+        description = "This endpoint takes a Markdown file input, converts it to HTML, and then to PDF format."
+    )
+    public ResponseEntity<byte[]> markdownToPdf(
+            @RequestPart(required = true, value = "fileInput") MultipartFile fileInput) 
+            throws IOException, InterruptedException {
+        
+        if (fileInput == null) {
+            throw new IllegalArgumentException("Please provide a Markdown file for conversion.");
+        }
+
+        String originalFilename = fileInput.getOriginalFilename();
+        if (originalFilename == null || !originalFilename.endsWith(".md")) {
+            throw new IllegalArgumentException("File must be in .md format.");
+        }
+
+        // Convert Markdown to HTML using CommonMark
+        Parser parser = Parser.builder().build();
+        Node document = parser.parse(new String(fileInput.getBytes()));
+        HtmlRenderer renderer = HtmlRenderer.builder().build();
+        String htmlContent = renderer.render(document);
+        
+        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent.getBytes(), "converted.html"); 
+
+        String outputFilename = originalFilename.replaceFirst("[.][^.]+$", "") + ".pdf";  // Remove file extension and append .pdf
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java
@@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -41,7 +42,7 @@ public class ConvertOfficeController {

        // Run the LibreOffice command
        List<String> command = new ArrayList<>(Arrays.asList("unoconv", "-vvv", "-f", "pdf", "-o", tempOutputFile.toString(), tempInputFile.toString()));
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);

        // Read the converted PDF file
        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
@@ -62,10 +63,10 @@ public class ConvertOfficeController {
        summary = "Convert a file to a PDF using LibreOffice",
        description = "This endpoint converts a given file to a PDF using LibreOffice API  Input:Any Output:PDF Type:SISO"
    )
-    public ResponseEntity<byte[]> processPdfWithOCR(
+    public ResponseEntity<byte[]> processFileToPDF(
        @RequestPart(required = true, value = "fileInput")
        @Parameter(
-            description = "The input file to be converted to a PDF file using OCR",
+            description = "The input file to be converted to a PDF file using LibreOffice",
            required = true
        )
            MultipartFile inputFile
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java
@@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -49,7 +50,7 @@ public class ConvertPDFToPDFA {
        command.add(tempInputFile.toString());
        command.add(tempOutputFile.toString());

-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);

        // Read the optimized PDF file
        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java
@@ -0,0 +1,76 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConvertWebsiteToPDF {
+
+	@PostMapping(consumes = "multipart/form-data", value = "/url-to-pdf")
+	@Operation(
+	    summary = "Convert a URL to a PDF",
+	    description = "This endpoint fetches content from a URL and converts it to a PDF format."
+	)
+	public ResponseEntity<byte[]> urlToPdf(
+	    @RequestParam(required = true, value = "urlInput")
+	    @Parameter(description = "The input URL to be converted to a PDF file", required = true)
+	        String URL) throws IOException, InterruptedException {
+
+	    // Validate the URL format
+	    if(!URL.matches("^https?://.*") || !GeneralUtils.isValidURL(URL)) {
+	        throw new IllegalArgumentException("Invalid URL format provided.");
+	    }
+	    Path tempOutputFile = null;
+	    byte[] pdfBytes;
+	    try {
+		    // Prepare the output file path
+		    tempOutputFile = Files.createTempFile("output_", ".pdf");
+	
+		    // Prepare the OCRmyPDF command
+		    List<String> command = new ArrayList<>();
+		    command.add("weasyprint");
+		    command.add(URL);
+		    command.add(tempOutputFile.toString());
+	
+		    ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT).runCommandWithOutputHandling(command);
+	
+		    // Read the optimized PDF file
+		    pdfBytes = Files.readAllBytes(tempOutputFile);
+	    }
+	    finally {
+		    // Clean up the temporary files
+		    Files.delete(tempOutputFile);
+	    }
+	    // Convert URL to a safe filename
+	    String outputFilename = convertURLToFileName(URL);
+	    
+	    return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+	}
+
+	private String convertURLToFileName(String url) {
+	    String safeName = url.replaceAll("[^a-zA-Z0-9]", "_");
+	    if(safeName.length() > 50) {
+	        safeName = safeName.substring(0, 50); // restrict to 50 characters
+	    }
+	    return safeName + ".pdf";
+	}
+
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java
@@ -1,162 +1,197 @@
-package stirling.software.SPDF.controller.api.filters;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-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.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-@RestController
-@Tag(name = "Filter", description = "Filter APIs")
-public class FilterController {
-
-	@PostMapping(consumes = "multipart/form-data", value = "/contains-text")
-	@Operation(summary = "Checks if a PDF contains set text, returns true if does", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean containsText(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
-			@Parameter(description = "The text to check for", required = true) String text,
-			@Parameter(description = "The page number to check for text on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
-			throws IOException, InterruptedException {
-		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		return PdfUtils.hasText(pdfDocument, pageNumber);
-	}
-
-	@PostMapping(consumes = "multipart/form-data", value = "/contains-image")
-	@Operation(summary = "Checks if a PDF contains an image", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean containsImage(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
-			@Parameter(description = "The page number to check for image on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
-			throws IOException, InterruptedException {
-		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
-		return PdfUtils.hasImagesOnPage(null);
-	}
-
-	@PostMapping(consumes = "multipart/form-data", value = "/page-count")
-	@Operation(summary = "Checks if a PDF is greater, less or equal to a setPageCount", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageCount(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-			@Parameter(description = "Page Count", required = true) String pageCount,
-			@Parameter(description = "Comparison type, accepts Greater, Equal, Less than", required = false) String comparator)
-			throws IOException, InterruptedException {
-		// Load the PDF
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
-		int actualPageCount = document.getNumberOfPages();
-
-		// Perform the comparison
-		switch (comparator) {
-		case "Greater":
-			return actualPageCount > Integer.parseInt(pageCount);
-		case "Equal":
-			return actualPageCount == Integer.parseInt(pageCount);
-		case "Less":
-			return actualPageCount < Integer.parseInt(pageCount);
-		default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
-	}
-
-	@PostMapping(consumes = "multipart/form-data", value = "/page-size")
-	@Operation(summary = "Checks if a PDF is of a certain size", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageSize(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "Standard Page Size", required = true) String standardPageSize,
-		@Parameter(description = "Comparison type, accepts Greater, Equal, Less than", required = false) String comparator)
-		throws IOException, InterruptedException {
-		
-		// Load the PDF
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
-
-		PDPage firstPage = document.getPage(0);
-		PDRectangle actualPageSize = firstPage.getMediaBox();
-
-		// Calculate the area of the actual page size
-		float actualArea = actualPageSize.getWidth() * actualPageSize.getHeight();
-
-		// Get the standard size and calculate its area
-		PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize);
-		float standardArea = standardSize.getWidth() * standardSize.getHeight();
-
-		// Perform the comparison
-		switch (comparator) {
-		case "Greater":
-			return actualArea > standardArea;
-		case "Equal":
-			return actualArea == standardArea;
-		case "Less":
-			return actualArea < standardArea;
-		default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
-	}
-	
-
-	@PostMapping(consumes = "multipart/form-data", value = "/file-size")
-	@Operation(summary = "Checks if a PDF is a set file size", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean fileSize(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "File Size", required = true) String fileSize,
-		@Parameter(description = "Comparison type, accepts Greater, Equal, Less than", required = false) String comparator)
-		throws IOException, InterruptedException {
-		
-		// Get the file size
-		long actualFileSize = inputFile.getSize();
-
-		// Perform the comparison
-		switch (comparator) {
-		case "Greater":
-			return actualFileSize > Long.parseLong(fileSize);
-		case "Equal":
-			return actualFileSize == Long.parseLong(fileSize);
-		case "Less":
-			return actualFileSize < Long.parseLong(fileSize);
-		default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
-	}
-
-	
-	@PostMapping(consumes = "multipart/form-data", value = "/page-rotation")
-	@Operation(summary = "Checks if a PDF is of a certain rotation", description = "Input:PDF Output:Boolean Type:SISO")
-	public Boolean pageRotation(
-		@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
-		@Parameter(description = "Rotation in degrees", required = true) int rotation,
-		@Parameter(description = "Comparison type, accepts Greater, Equal, Less than", required = false) String comparator)
-		throws IOException, InterruptedException {
-		
-		// Load the PDF
-		PDDocument document = PDDocument.load(inputFile.getInputStream());
-
-		// Get the rotation of the first page
-		PDPage firstPage = document.getPage(0);
-		int actualRotation = firstPage.getRotation();
-
-		// Perform the comparison
-		switch (comparator) {
-		case "Greater":
-			return actualRotation > rotation;
-		case "Equal":
-			return actualRotation == rotation;
-		case "Less":
-			return actualRotation < rotation;
-		default:
-			throw new IllegalArgumentException("Invalid comparator: " + comparator);
-		}
-	}
-
-}
+package stirling.software.SPDF.controller.api.filters;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.PdfUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Filter", description = "Filter APIs")
+public class FilterController {
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-text")
+	@Operation(summary = "Checks if a PDF contains set text, returns true if does", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> containsText(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
+			@Parameter(description = "The text to check for", required = true) String text,
+			@Parameter(description = "The page number to check for text on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
+			throws IOException, InterruptedException {
+		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
+		if (PdfUtils.hasText(pdfDocument, pageNumber, text))
+			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+		return null;
+	}
+
+	// TODO
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-contains-image")
+	@Operation(summary = "Checks if a PDF contains an image", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> containsImage(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to be converted to a PDF/A file", required = true) MultipartFile inputFile,
+			@Parameter(description = "The page number to check for image on accepts 'All', ranges like '1-4'", required = false) String pageNumber)
+			throws IOException, InterruptedException {
+		PDDocument pdfDocument = PDDocument.load(inputFile.getInputStream());
+		if (PdfUtils.hasImages(pdfDocument, pageNumber))
+			return WebResponseUtils.pdfDocToWebResponse(pdfDocument, inputFile.getOriginalFilename());
+		return null;
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-count")
+	@Operation(summary = "Checks if a PDF is greater, less or equal to a setPageCount", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> pageCount(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "Page Count", required = true) String pageCount,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+		// Load the PDF
+		PDDocument document = PDDocument.load(inputFile.getInputStream());
+		int actualPageCount = document.getNumberOfPages();
+
+		boolean valid = false;
+		// Perform the comparison
+		switch (comparator) {
+		case "Greater":
+			valid = actualPageCount > Integer.parseInt(pageCount);
+			break;
+		case "Equal":
+			valid = actualPageCount == Integer.parseInt(pageCount);
+			break;
+		case "Less":
+			valid = actualPageCount < Integer.parseInt(pageCount);
+			break;
+		default:
+			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-size")
+	@Operation(summary = "Checks if a PDF is of a certain size", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> pageSize(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "Standard Page Size", required = true) String standardPageSize,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
+		// Load the PDF
+		PDDocument document = PDDocument.load(inputFile.getInputStream());
+
+		PDPage firstPage = document.getPage(0);
+		PDRectangle actualPageSize = firstPage.getMediaBox();
+
+		// Calculate the area of the actual page size
+		float actualArea = actualPageSize.getWidth() * actualPageSize.getHeight();
+
+		// Get the standard size and calculate its area
+		PDRectangle standardSize = PdfUtils.textToPageSize(standardPageSize);
+		float standardArea = standardSize.getWidth() * standardSize.getHeight();
+
+		boolean valid = false;
+		// Perform the comparison
+		switch (comparator) {
+		case "Greater":
+			valid = actualArea > standardArea;
+			break;
+		case "Equal":
+			valid = actualArea == standardArea;
+			break;
+		case "Less":
+			valid = actualArea < standardArea;
+			break;
+		default:
+			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-file-size")
+	@Operation(summary = "Checks if a PDF is a set file size", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> fileSize(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "File Size", required = true) String fileSize,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
+		// Get the file size
+		long actualFileSize = inputFile.getSize();
+
+		boolean valid = false;
+		// Perform the comparison
+		switch (comparator) {
+		case "Greater":
+			valid = actualFileSize > Long.parseLong(fileSize);
+			break;
+		case "Equal":
+			valid = actualFileSize == Long.parseLong(fileSize);
+			break;
+		case "Less":
+			valid = actualFileSize < Long.parseLong(fileSize);
+			break;
+		default:
+			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+	}
+
+	@PostMapping(consumes = "multipart/form-data", value = "/filter-page-rotation")
+	@Operation(summary = "Checks if a PDF is of a certain rotation", description = "Input:PDF Output:Boolean Type:SISO")
+	public ResponseEntity<byte[]> pageRotation(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file", required = true) MultipartFile inputFile,
+			@Parameter(description = "Rotation in degrees", required = true) int rotation,
+			@Parameter(description = "Comparison type", schema = @Schema(description = "The comparison type, accepts Greater, Equal, Less than", allowableValues = {
+					"Greater", "Equal", "Less" })) String comparator)
+			throws IOException, InterruptedException {
+
+		// Load the PDF
+		PDDocument document = PDDocument.load(inputFile.getInputStream());
+
+		// Get the rotation of the first page
+		PDPage firstPage = document.getPage(0);
+		int actualRotation = firstPage.getRotation();
+		boolean valid = false;
+		// Perform the comparison
+		switch (comparator) {
+		case "Greater":
+			valid = actualRotation > rotation;
+			break;
+		case "Equal":
+			valid = actualRotation == rotation;
+			break;
+		case "Less":
+			valid = actualRotation < rotation;
+			break;
+		default:
+			throw new IllegalArgumentException("Invalid comparator: " + comparator);
+		}
+
+		if (valid)
+			return WebResponseUtils.multiPartFileToWebResponse(inputFile);
+		return null;
+
+	}
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/other/AutoRenameController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/AutoRenameController.java
@@ -0,0 +1,128 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.text.TextPosition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@Tag(name = "Other", description = "Other APIs")
+public class AutoRenameController {
+
+    private static final Logger logger = LoggerFactory.getLogger(AutoRenameController.class);
+
+    private static final float TITLE_FONT_SIZE_THRESHOLD = 20.0f;
+    private static final int LINE_LIMIT = 11;
+
+    @PostMapping(consumes = "multipart/form-data", value = "/auto-rename")
+    @Operation(summary = "Extract header from PDF file", description = "This endpoint accepts a PDF file and attempts to extract its title or header based on heuristics. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> extractHeader(
+    	            @RequestPart(value = "fileInput") @Parameter(description = "The input PDF file from which the header is to be extracted.", required = true) MultipartFile file,
+    	            @RequestParam(required = false, defaultValue = "false") @Parameter(description = "Flag indicating whether to use the first text as a fallback if no suitable title is found. Defaults to false.", required = false) Boolean useFirstTextAsFallback)
+    	            throws Exception {
+
+    	        PDDocument document = PDDocument.load(file.getInputStream());
+    	        PDFTextStripper reader = new PDFTextStripper() {
+    	            class LineInfo {
+    	                String text;
+    	                float fontSize;
+
+    	                LineInfo(String text, float fontSize) {
+    	                    this.text = text;
+    	                    this.fontSize = fontSize;
+    	                }
+    	            }
+
+    	            List<LineInfo> lineInfos = new ArrayList<>();
+    	            StringBuilder lineBuilder = new StringBuilder();
+    	            float lastY = -1;
+    	            float maxFontSizeInLine = 0.0f;
+    	            int lineCount = 0;
+
+    	            @Override
+    	            protected void processTextPosition(TextPosition text) {
+    	                if (lastY != text.getY() && lineCount < LINE_LIMIT) {
+    	                    processLine();
+    	                    lineBuilder = new StringBuilder(text.getUnicode());
+    	                    maxFontSizeInLine = text.getFontSizeInPt();
+    	                    lastY = text.getY();
+    	                    lineCount++;
+    	                } else if (lineCount < LINE_LIMIT) {
+    	                    lineBuilder.append(text.getUnicode());
+    	                    if (text.getFontSizeInPt() > maxFontSizeInLine) {
+    	                        maxFontSizeInLine = text.getFontSizeInPt();
+    	                    }
+    	                }
+    	            }
+
+    	            private void processLine() {
+    	                if (lineBuilder.length() > 0 && lineCount < LINE_LIMIT) {
+    	                    lineInfos.add(new LineInfo(lineBuilder.toString(), maxFontSizeInLine));
+    	                }
+    	            }
+
+    	            @Override
+    	            public String getText(PDDocument doc) throws IOException {
+    	                this.lineInfos.clear();
+    	                this.lineBuilder = new StringBuilder();
+    	                this.lastY = -1;
+    	                this.maxFontSizeInLine = 0.0f;
+    	                this.lineCount = 0;
+    	                super.getText(doc);
+    	                processLine(); // Process the last line
+
+    	                // Merge lines with same font size
+    	                List<LineInfo> mergedLineInfos = new ArrayList<>();
+    	                for (int i = 0; i < lineInfos.size(); i++) {
+    	                    String mergedText = lineInfos.get(i).text;
+    	                    float fontSize = lineInfos.get(i).fontSize;
+    	                    while (i + 1 < lineInfos.size() && lineInfos.get(i + 1).fontSize == fontSize) {
+    	                        mergedText += " " + lineInfos.get(i + 1).text;
+    	                        i++;
+    	                    }
+    	                    mergedLineInfos.add(new LineInfo(mergedText, fontSize));
+    	                }
+
+    	                // Sort lines by font size in descending order and get the first one
+    	                mergedLineInfos.sort(Comparator.comparing((LineInfo li) -> li.fontSize).reversed());
+    	                String title = mergedLineInfos.isEmpty() ? null : mergedLineInfos.get(0).text;
+
+    	                return title != null ? title : (useFirstTextAsFallback ? (mergedLineInfos.isEmpty() ? null : mergedLineInfos.get(mergedLineInfos.size() - 1).text) : null);
+    	            }
+
+    	        };
+
+    	        String header = reader.getText(document);
+
+
+        
+        // Sanitize the header string by removing characters not allowed in a filename.
+        if (header != null && header.length() < 255) {
+            header = header.replaceAll("[/\\\\?%*:|\"<>]", "");
+            return WebResponseUtils.pdfDocToWebResponse(document, header + ".pdf");
+        } else {
+        	logger.info("File has no good title to be found");
+        	return WebResponseUtils.pdfDocToWebResponse(document, file.getOriginalFilename());
+        }
+    }
+    
+
+
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/other/AutoSplitPdfController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/AutoSplitPdfController.java
@@ -0,0 +1,141 @@
+package stirling.software.SPDF.controller.api.other;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+import java.awt.image.DataBufferInt;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.PlanarYUVLuminanceSource;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+public class AutoSplitPdfController {
+
+    private static final String QR_CONTENT = "https://github.com/Frooodle/Stirling-PDF";
+
+    @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
+    @Operation(summary = "Auto split PDF pages into separate documents", description = "This endpoint accepts a PDF file, scans each page for a specific QR code, and splits the document at the QR code boundaries. The output is a zip file containing each separate PDF document. Input:PDF Output:ZIP Type:SISO")
+    public ResponseEntity<byte[]> autoSplitPdf(
+        @RequestParam("fileInput") @Parameter(description = "The input PDF file which needs to be split into separate documents based on QR code boundaries.", required = true) MultipartFile file,
+        @RequestParam(value ="duplexMode",defaultValue = "false") @Parameter(description = "Flag indicating if the duplex mode is active, where the page after the divider also gets removed.", required = false) boolean duplexMode)
+        throws IOException {
+
+        InputStream inputStream = file.getInputStream();
+        PDDocument document = PDDocument.load(inputStream);
+        PDFRenderer pdfRenderer = new PDFRenderer(document);
+
+        List<PDDocument> splitDocuments = new ArrayList<>();
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+
+        for (int page = 0; page < document.getNumberOfPages(); ++page) {
+            BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 150);
+            String result = decodeQRCode(bim);
+
+            if (QR_CONTENT.equals(result) && page != 0) {
+                splitDocuments.add(new PDDocument());
+            }
+
+            if (!splitDocuments.isEmpty() && !QR_CONTENT.equals(result)) {
+                splitDocuments.get(splitDocuments.size() - 1).addPage(document.getPage(page));
+            } else if (page == 0) {
+                PDDocument firstDocument = new PDDocument();
+                firstDocument.addPage(document.getPage(page));
+                splitDocuments.add(firstDocument);
+            }
+
+            // If duplexMode is true and current page is a divider, then skip next page
+            if (duplexMode && QR_CONTENT.equals(result)) {
+                page++;
+            }
+        }
+
+        // Remove split documents that have no pages
+        splitDocuments.removeIf(pdDocument -> pdDocument.getNumberOfPages() == 0);
+
+        for (PDDocument splitDocument : splitDocuments) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            splitDocument.save(baos);
+            splitDocumentsBoas.add(baos);
+            splitDocument.close();
+        }
+
+        document.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
+        byte[] data;
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+        	data = Files.readAllBytes(zipFile);
+            Files.delete(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+
+    private static String decodeQRCode(BufferedImage bufferedImage) {
+        LuminanceSource source;
+
+        if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferByte) {
+            byte[] pixels = ((DataBufferByte) bufferedImage.getRaster().getDataBuffer()).getData();
+            source = new PlanarYUVLuminanceSource(pixels, bufferedImage.getWidth(), bufferedImage.getHeight(), 0, 0, bufferedImage.getWidth(), bufferedImage.getHeight(), false);
+        } else if (bufferedImage.getRaster().getDataBuffer() instanceof DataBufferInt) {
+            int[] pixels = ((DataBufferInt) bufferedImage.getRaster().getDataBuffer()).getData();
+            byte[] newPixels = new byte[pixels.length];
+            for (int i = 0; i < pixels.length; i++) {
+                newPixels[i] = (byte) (pixels[i] & 0xff);
+            }
+            source = new PlanarYUVLuminanceSource(newPixels, bufferedImage.getWidth(), bufferedImage.getHeight(), 0, 0, bufferedImage.getWidth(), bufferedImage.getHeight(), false);
+        } else {
+            throw new IllegalArgumentException("BufferedImage must have 8-bit gray scale, 24-bit RGB, 32-bit ARGB (packed int), byte gray, or 3-byte/4-byte RGB image data");
+        }
+
+        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+        try {
+            Result result = new MultiFormatReader().decode(bitmap);
+            return result.getText();
+        } catch (NotFoundException e) {
+            return null; // there is no QR code in the image
+        }
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/other/BlankPageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/BlankPageController.java
@@ -31,6 +31,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -86,10 +87,10 @@ public class BlankPageController {
                        List<String> command = new ArrayList<>(Arrays.asList("python3", System.getProperty("user.dir") + "/scripts/detect-blank-pages.py", tempFile.toString() ,"--threshold", String.valueOf(threshold), "--white_percent", String.valueOf(whitePercent)));
    
                        // Run CLI command
-                        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+                        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
    
                        // does contain data
-                        if (returnCode == 0) {
+                        if (returnCode.getRc() == 0) {
                            System.out.println("page " + pageIndex + " has image which is not blank");
                            pagesToKeepIndex.add(pageIndex);
                        } else {
--- a/src/main/java/stirling/software/SPDF/controller/api/other/CompressController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/CompressController.java
@@ -34,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -116,7 +117,7 @@ public class CompressController {
            command.add("-sOutputFile=" + tempOutputFile.toString());
            command.add(tempInputFile.toString());

-            int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);

            // Check if file size is within expected size or not auto mode so instantly finish
            long outputFileSize = Files.size(tempOutputFile);
@@ -221,6 +222,15 @@ public class CompressController {
        // Read the optimized PDF file
        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);

+        // Check if optimized file is larger than the original
+        if(pdfBytes.length > inputFileSize) {
+            // Log the occurrence
+            logger.warn("Optimized file is larger than the original. Returning the original file instead.");
+
+            // Read the original file again
+            pdfBytes = Files.readAllBytes(tempInputFile);
+        }
+
        // Clean up the temporary files
        Files.delete(tempInputFile);
        Files.delete(tempOutputFile);
--- a/src/main/java/stirling/software/SPDF/controller/api/other/ExtractImageScansController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/ExtractImageScansController.java
@@ -33,6 +33,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -117,7 +118,7 @@ public class ExtractImageScansController {


            // Run CLI command
-            int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV).runCommandWithOutputHandling(command);

            // Read the output photos in temp directory
            List<Path> tempOutputFiles = Files.list(tempDir).sorted().collect(Collectors.toList());
--- a/src/main/java/stirling/software/SPDF/controller/api/other/OCRController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/OCRController.java
@@ -29,6 +29,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -141,8 +142,12 @@ public class OCRController {
        command.addAll(Arrays.asList("--language", languageOption, tempInputFile.toString(), tempOutputFile.toString()));

        // Run CLI command
-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
-
+        ProcessExecutorResult result = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        if(result.getRc() != 0 && result.getMessages().contains("multiprocessing/synchronize.py") && result.getMessages().contains("OSError: [Errno 38] Function not implemented")) {
+        	command.add("--jobs");
+        	command.add("1");
+        	result = ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF).runCommandWithOutputHandling(command);
+        }
        

        
@@ -153,7 +158,7 @@ public class OCRController {

            List<String> gsCommand = Arrays.asList("gs", "-sDEVICE=pdfwrite", "-dFILTERIMAGE", "-o", tempPdfWithoutImages.toString(), tempOutputFile.toString());

-            int gsReturnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
+            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(gsCommand);
            tempOutputFile = tempPdfWithoutImages;
        }
        // Read the OCR processed PDF file
--- a/src/main/java/stirling/software/SPDF/controller/api/other/PageNumbersController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/PageNumbersController.java
@@ -0,0 +1,148 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.itextpdf.io.font.constants.StandardFonts;
+import com.itextpdf.kernel.font.PdfFont;
+import com.itextpdf.kernel.font.PdfFontFactory;
+import com.itextpdf.kernel.geom.Rectangle;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfPage;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfWriter;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.layout.Canvas;
+import com.itextpdf.layout.element.Paragraph;
+import com.itextpdf.layout.properties.TextAlignment;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Other", description = "Other APIs")
+public class PageNumbersController {
+
+    private static final Logger logger = LoggerFactory.getLogger(PageNumbersController.class);
+
+    @PostMapping(value = "/add-page-numbers", consumes = "multipart/form-data")
+    @Operation(summary = "Add page numbers to a PDF document", description = "This operation takes an input PDF file and adds page numbers to it. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> addPageNumbers(
+        @Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
+        @Parameter(description = "Custom margin: small/medium/large", required = true, schema = @Schema(type = "string", allowableValues = {"small", "medium", "large"})) @RequestParam("customMargin") String customMargin,
+        @Parameter(description = "Position: 1 of 9 positions", required = true, schema = @Schema(type = "integer", minimum = "1", maximum = "9")) @RequestParam("position") int position,
+        @Parameter(description = "Starting number", required = true, schema = @Schema(type = "integer", minimum = "1")) @RequestParam("startingNumber") int startingNumber,
+        @Parameter(description = "Which pages to number, default all", required = false, schema = @Schema(type = "string")) @RequestParam(value = "pagesToNumber", required = false) String pagesToNumber,
+        @Parameter(description = "Custom text: defaults to just number but can have things like \"Page {n} of {p}\"", required = false, schema = @Schema(type = "string")) @RequestParam(value = "customText", required = false) String customText)
+        throws IOException {
+
+        byte[] fileBytes = file.getBytes();
+        ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
+
+        int pageNumber = startingNumber;
+        float marginFactor;
+        switch (customMargin.toLowerCase()) {
+            case "small":
+                marginFactor = 0.02f;
+                break;
+            case "medium":
+                marginFactor = 0.035f;
+                break;
+            case "large":
+                marginFactor = 0.05f;
+                break;
+            case "x-large":
+                marginFactor = 0.1f;
+                break;
+            default:
+                marginFactor = 0.035f;
+                break;
+        }
+
+        float fontSize = 12.0f;
+
+        PdfReader reader = new PdfReader(bais);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        PdfWriter writer = new PdfWriter(baos);
+
+        PdfDocument pdfDoc = new PdfDocument(reader, writer);
+
+        List<Integer> pagesToNumberList = GeneralUtils.parsePageList(pagesToNumber.split(","), pdfDoc.getNumberOfPages());
+
+        for (int i : pagesToNumberList) {
+            PdfPage page = pdfDoc.getPage(i+1);
+            Rectangle pageSize = page.getPageSize();
+            PdfCanvas pdfCanvas = new PdfCanvas(page.newContentStreamAfter(), page.getResources(), pdfDoc);
+
+            String text = customText != null ? customText.replace("{n}", String.valueOf(pageNumber)).replace("{total}", String.valueOf(pdfDoc.getNumberOfPages())).replace("{filename}", file.getOriginalFilename().replaceFirst("[.][^.]+$", "")) : String.valueOf(pageNumber);
+
+            PdfFont font = PdfFontFactory.createFont(StandardFonts.HELVETICA);
+            float textWidth = font.getWidth(text, fontSize);
+            float textHeight = font.getAscent(text, fontSize) - font.getDescent(text, fontSize);
+
+            float x, y;
+            TextAlignment alignment;
+
+            int xGroup = (position - 1) % 3;
+            int yGroup = 2 - (position - 1) / 3;
+
+            switch (xGroup) {
+                case 0:  // left
+                    x = pageSize.getLeft() + marginFactor * pageSize.getWidth();
+                    alignment = TextAlignment.LEFT;
+                    break;
+                case 1:  // center
+                    x = pageSize.getLeft() + (pageSize.getWidth()) / 2;
+                    alignment = TextAlignment.CENTER;
+                    break;
+                default: // right
+                    x = pageSize.getRight() - marginFactor * pageSize.getWidth();
+                    alignment = TextAlignment.RIGHT;
+                    break;
+            }
+
+            switch (yGroup) {
+            case 0:  // bottom
+                y = pageSize.getBottom() +   marginFactor * pageSize.getHeight();
+                break;
+            case 1:  // middle
+                y = pageSize.getBottom() + (pageSize.getHeight() ) / 2;
+                break;
+            default: // top
+                y = pageSize.getTop() - marginFactor * pageSize.getHeight();
+                break;
+        }
+
+            new Canvas(pdfCanvas, page.getPageSize())
+                    .showTextAligned(new Paragraph(text).setFont(font).setFontSize(fontSize), x, y, alignment);
+
+            pageNumber++;
+        }
+
+
+        pdfDoc.close();
+        byte[] resultBytes = baos.toByteArray();
+
+        return WebResponseUtils.bytesToWebResponse(resultBytes, URLEncoder.encode(file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_numbersAdded.pdf", "UTF-8"), MediaType.APPLICATION_PDF);
+
+    }
+
+
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/other/RepairController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/RepairController.java
@@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.ProcessExecutor;
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.SPDF.utils.WebResponseUtils;

@RestController
@@ -51,7 +52,7 @@ public class RepairController {
        command.add(tempInputFile.toString());


-        int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);
+        ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT).runCommandWithOutputHandling(command);

        // Read the optimized PDF file
        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
--- a/src/main/java/stirling/software/SPDF/controller/api/other/ShowJavascript.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/other/ShowJavascript.java
@@ -0,0 +1,85 @@
+package stirling.software.SPDF.controller.api.other;
+
+import java.nio.charset.StandardCharsets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.itextpdf.kernel.pdf.PdfArray;
+import com.itextpdf.kernel.pdf.PdfDictionary;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfName;
+import com.itextpdf.kernel.pdf.PdfObject;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfStream;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@Tag(name = "Other", description = "Other APIs")
+public class ShowJavascript {
+
+    private static final Logger logger = LoggerFactory.getLogger(ShowJavascript.class);
+    @PostMapping(consumes = "multipart/form-data", value = "/show-javascript")
+    @Operation(summary = "Extract header from PDF file", description = "This endpoint accepts a PDF file and attempts to extract its title or header based on heuristics. Input:PDF Output:PDF Type:SISO")
+    public ResponseEntity<byte[]> extractHeader(
+    	            @RequestPart(value = "fileInput") @Parameter(description = "The input PDF file from which the javascript is to be extracted.", required = true) MultipartFile inputFile)  
+    	            throws Exception {
+
+    	try (
+			    PdfDocument itextDoc = new PdfDocument(new PdfReader(inputFile.getInputStream()))
+			) {
+    	        
+    		String name = "";
+    		String script = "";
+    		String entryName = "File: "+inputFile.getOriginalFilename() + ",  Script: ";
+    	      //Javascript
+                PdfDictionary namesDict = itextDoc.getCatalog().getPdfObject().getAsDictionary(PdfName.Names);
+                if (namesDict != null) {
+                    PdfDictionary javascriptDict = namesDict.getAsDictionary(PdfName.JavaScript);
+                    if (javascriptDict != null) {
+
+                        PdfArray namesArray = javascriptDict.getAsArray(PdfName.Names);
+                        for (int i = 0; i < namesArray.size(); i += 2) {
+                            if(namesArray.getAsString(i) != null)
+                            	name =  namesArray.getAsString(i).toString();
+
+                            PdfObject jsCode = namesArray.get(i+1);
+                            if (jsCode instanceof PdfStream) {
+                                byte[] jsCodeBytes = ((PdfStream)jsCode).getBytes();
+                                String jsCodeStr = new String(jsCodeBytes, StandardCharsets.UTF_8);
+                                script = "//" + entryName + name + "\n" +jsCodeStr;
+
+                            } else if (jsCode instanceof PdfDictionary) {
+                                // If the JS code is in a dictionary, you'll need to know the key to use.
+                                // Assuming the key is PdfName.JS:
+                                PdfStream jsCodeStream = ((PdfDictionary)jsCode).getAsStream(PdfName.JS);
+                                if (jsCodeStream != null) {
+                                    byte[] jsCodeBytes = jsCodeStream.getBytes();
+                                    String jsCodeStr = new String(jsCodeBytes, StandardCharsets.UTF_8);
+                                    script = "//" + entryName + name + "\n" +jsCodeStr;
+                                }
+                            }
+                        }
+
+                    }
+                }
+                if(script.equals("")) {
+                	script = "PDF '" +inputFile.getOriginalFilename() + "' does not contain Javascript";
+                }
+               return WebResponseUtils.bytesToWebResponse(script.getBytes(), name + ".js");
+    	}
+    	
+    }
+    
+
+
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/Controller.java
@@ -1,399 +0,0 @@
-package stirling.software.SPDF.controller.api.pipeline;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.core.io.Resource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.model.PipelineConfig;
-import stirling.software.SPDF.model.PipelineOperation;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-
-@RestController
-@Tag(name = "Pipeline", description = "Pipeline APIs")
-public class Controller {
-
-	@Autowired
-	private ObjectMapper objectMapper;
-	
-	
-	final String jsonFileName = "pipelineCofig.json";
-	final String watchedFoldersDir = "watchedFolders/";
-	@Scheduled(fixedRate = 5000)
-	public void scanFolders() {
-		Path watchedFolderPath = Paths.get(watchedFoldersDir);
-	    if (!Files.exists(watchedFolderPath)) {
-	        try {
-	            Files.createDirectories(watchedFolderPath);
-	        } catch (IOException e) {
-	            e.printStackTrace();
-	            return;
-	        }
-	    }
-	    
-		try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
-	        paths.filter(Files::isDirectory).forEach(t -> {
-				try {
-					if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
-						handleDirectory(t);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			});
-	    } catch (Exception e) {
-	        e.printStackTrace();
-	    }
-	}
-	
-	private void handleDirectory(Path dir) throws Exception {
-	    Path jsonFile = dir.resolve(jsonFileName);
-	    Path processingDir = dir.resolve("processing"); // Directory to move files during processing
-	    if (!Files.exists(processingDir)) {
-	        Files.createDirectory(processingDir);
-	    }
-
-	    if (Files.exists(jsonFile)) {
-	        // Read JSON file
-	        String jsonString;
-	        try {
-	            jsonString = new String(Files.readAllBytes(jsonFile));
-	        } catch (IOException e) {
-	            e.printStackTrace();
-	            return;
-	        }
-
-	        // Decode JSON to PipelineConfig
-	        PipelineConfig config;
-	        try {
-	            config = objectMapper.readValue(jsonString, PipelineConfig.class);
-	            // Assuming your PipelineConfig class has getters for all necessary fields, you can perform checks here
-	            if (config.getOperations() == null || config.getOutputDir() == null || config.getName() == null) {
-	                throw new IOException("Invalid JSON format");
-	            }
-	        } catch (IOException e) {
-	            e.printStackTrace();
-	            return;
-	        }
-
-	        // For each operation in the pipeline
-	        for (PipelineOperation operation : config.getOperations()) {
-	            // Collect all files based on fileInput
-	            File[] files;
-	            String fileInput = (String) operation.getParameters().get("fileInput");
-	            if ("automated".equals(fileInput)) {
-	                // If fileInput is "automated", process all files in the directory
-	                try (Stream<Path> paths = Files.list(dir)) {
-	                    files = paths.filter(path -> !path.equals(jsonFile))
-	                            .map(Path::toFile)
-	                            .toArray(File[]::new);
-	                } catch (IOException e) {
-	                    e.printStackTrace();
-	                    return;
-	                }
-	            } else {
-	                // If fileInput contains a path, process only this file
-	                files = new File[]{new File(fileInput)};
-	            }
-	            
-	            // Prepare the files for processing
-	            File[] filesToProcess = files.clone();
-	            for (File file : filesToProcess) {
-	                Files.move(file.toPath(), processingDir.resolve(file.getName()));
-	            }
-	            
-	            // Process the files
-	            try {
-	                List<Resource> resources = handleFiles(filesToProcess, jsonString);
-
-	                // Move resultant files and rename them as per config in JSON file
-	                for (Resource resource : resources) {
-	                    String outputFileName = config.getOutputPattern().replace("{filename}", resource.getFile().getName());
-	                    outputFileName = outputFileName.replace("{pipelineName}", config.getName());
-	                    DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-	                    outputFileName = outputFileName.replace("{date}", LocalDate.now().format(dateFormatter));
-	                    DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HHmmss");
-	                    outputFileName = outputFileName.replace("{time}", LocalTime.now().format(timeFormatter));
-	                    // {filename} {folder} {date} {tmime} {pipeline}
-
-	                    Files.move(resource.getFile().toPath(), Paths.get(config.getOutputDir(), outputFileName));
-	                }
-	                
-	                // If successful, delete the original files
-	                for (File file : filesToProcess) {
-	                    Files.deleteIfExists(processingDir.resolve(file.getName()));
-	                }
-	            } catch (Exception e) {
-	                // If an error occurs, move the original files back
-	                for (File file : filesToProcess) {
-	                    Files.move(processingDir.resolve(file.getName()), file.toPath());
-	                }
-	                throw e;
-	            }
-	        }
-	    }
-	}
-
-
-
-
-List<Resource> processFiles(List<Resource> outputFiles, String jsonString) throws Exception{
-	ObjectMapper mapper = new ObjectMapper();
-	JsonNode jsonNode = mapper.readTree(jsonString);
-
-	JsonNode pipelineNode = jsonNode.get("pipeline");
-	ByteArrayOutputStream logStream = new ByteArrayOutputStream();
-	PrintStream logPrintStream = new PrintStream(logStream);
-	
-	boolean hasErrors = false;
-
-	for (JsonNode operationNode : pipelineNode) {
-		String operation = operationNode.get("operation").asText();
-		JsonNode parametersNode = operationNode.get("parameters");
-		String inputFileExtension = "";
-		if(operationNode.has("inputFileType")) {
-		 inputFileExtension = operationNode.get("inputFileType").asText();
-		} else {
-			inputFileExtension=".pdf";
-		}
-
-		List<Resource> newOutputFiles = new ArrayList<>();
-		boolean hasInputFileType = false;
-
-		for (Resource file : outputFiles) {
-			if (file.getFilename().endsWith(inputFileExtension)) {
-				hasInputFileType = true;
-				MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-				body.add("fileInput", file);
-
-				Iterator<Map.Entry<String, JsonNode>> parameters = parametersNode.fields();
-				while (parameters.hasNext()) {
-					Map.Entry<String, JsonNode> parameter = parameters.next();
-					body.add(parameter.getKey(), parameter.getValue().asText());
-				}
-
-				HttpHeaders headers = new HttpHeaders();
-				headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-
-				HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
-
-				RestTemplate restTemplate = new RestTemplate();
-				String url = "http://localhost:8080/" + operation;
-
-				ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
-
-				if (!response.getStatusCode().equals(HttpStatus.OK)) {
-					logPrintStream.println("Error: " + response.getBody());
-					hasErrors = true;
-                    continue;
-				}
-
-				// Check if the response body is a zip file
-				if (isZip(response.getBody())) {
-					// Unzip the file and add all the files to the new output files
-					newOutputFiles.addAll(unzip(response.getBody()));
-				} else {
-					Resource outputResource = new ByteArrayResource(response.getBody()) {
-						@Override
-						public String getFilename() {
-							return file.getFilename(); // Preserving original filename
-						}
-					};
-					newOutputFiles.add(outputResource);
-				}
-			}
-
-			 if (!hasInputFileType) {
-                logPrintStream.println("No files with extension " + inputFileExtension + " found for operation " + operation);
-                hasErrors = true;
-            }
-			 
-			outputFiles = newOutputFiles;
-		}
-		logPrintStream.close();
-		
-	}
-	return outputFiles;
-}
-	
-
-List<Resource> handleFiles(File[] files, String jsonString) throws Exception{
-	ObjectMapper mapper = new ObjectMapper();
-	JsonNode jsonNode = mapper.readTree(jsonString);
-
-	JsonNode pipelineNode = jsonNode.get("pipeline");
-	ByteArrayOutputStream logStream = new ByteArrayOutputStream();
-	PrintStream logPrintStream = new PrintStream(logStream);
-	
-	boolean hasErrors = false;
-	List<Resource> outputFiles = new ArrayList<>();
-
-	for (File file : files) {
-		Path path = Paths.get(file.getAbsolutePath());
-        Resource fileResource = new ByteArrayResource(Files.readAllBytes(path)) {
-            @Override
-            public String getFilename() {
-                return file.getName();
-            }
-        };
-		outputFiles.add(fileResource);
-	}
-	return processFiles(outputFiles, jsonString);
-}
-
-	List<Resource> handleFiles(MultipartFile[] files, String jsonString) throws Exception{
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode jsonNode = mapper.readTree(jsonString);
-
-		JsonNode pipelineNode = jsonNode.get("pipeline");
-		ByteArrayOutputStream logStream = new ByteArrayOutputStream();
-		PrintStream logPrintStream = new PrintStream(logStream);
-		
-		boolean hasErrors = false;
-		List<Resource> outputFiles = new ArrayList<>();
-
-		for (MultipartFile file : files) {
-			Resource fileResource = new ByteArrayResource(file.getBytes()) {
-				@Override
-				public String getFilename() {
-					return file.getOriginalFilename();
-				}
-			};
-			outputFiles.add(fileResource);
-		}
-		return processFiles(outputFiles, jsonString);
-	}
-	
-	@PostMapping("/handleData")
-	public ResponseEntity<byte[]> handleData(@RequestPart("fileInput") MultipartFile[] files,
-			@RequestParam("json") String jsonString) {
-		try {
-			
-		List<Resource> outputFiles = handleFiles(files, jsonString);
-
-		if (outputFiles.size() == 1) {
-		    // If there is only one file, return it directly
-		    Resource singleFile = outputFiles.get(0);
-		    InputStream is = singleFile.getInputStream();
-		    byte[] bytes = new byte[(int)singleFile.contentLength()];
-		    is.read(bytes);
-		    is.close();
-		
-		    return WebResponseUtils.bytesToWebResponse(bytes, singleFile.getFilename(), MediaType.APPLICATION_OCTET_STREAM);
-		} 
-
-			// Create a ByteArrayOutputStream to hold the zip
-		    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		    ZipOutputStream zipOut = new ZipOutputStream(baos);
-
-		    // Loop through each file and add it to the zip
-		    for (Resource file : outputFiles) {
-		        ZipEntry zipEntry = new ZipEntry(file.getFilename());
-		        zipOut.putNextEntry(zipEntry);
-
-		        // Read the file into a byte array
-		        InputStream is = file.getInputStream();
-		        byte[] bytes = new byte[(int)file.contentLength()];
-		        is.read(bytes);
-
-		        // Write the bytes of the file to the zip
-		        zipOut.write(bytes, 0, bytes.length);
-		        zipOut.closeEntry();
-
-		        is.close();
-		    }
-
-		    zipOut.close();
-		    
-			return WebResponseUtils.boasToWebResponse(baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	private boolean isZip(byte[] data) {
-		if (data == null || data.length < 4) {
-			return false;
-		}
-
-		// Check the first four bytes of the data against the standard zip magic number
-		return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
-	}
-
-	private List<Resource> unzip(byte[] data) throws IOException {
-		List<Resource> unzippedFiles = new ArrayList<>();
-
-		try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
-				ZipInputStream zis = new ZipInputStream(bais)) {
-
-			ZipEntry entry;
-			while ((entry = zis.getNextEntry()) != null) {
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				byte[] buffer = new byte[1024];
-				int count;
-
-				while ((count = zis.read(buffer)) != -1) {
-					baos.write(buffer, 0, count);
-				}
-
-				final String filename = entry.getName();
-				Resource fileResource = new ByteArrayResource(baos.toByteArray()) {
-					@Override
-					public String getFilename() {
-						return filename;
-					}
-				};
-
-				// If the unzipped file is a zip file, unzip it
-				if (isZip(baos.toByteArray())) {
-					unzippedFiles.addAll(unzip(baos.toByteArray()));
-				} else {
-					unzippedFiles.add(fileResource);
-				}
-			}
-		}
-
-		return unzippedFiles;
-	}
-}
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java
@@ -0,0 +1,521 @@
+package stirling.software.SPDF.controller.api.pipeline;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.PipelineConfig;
+import stirling.software.SPDF.model.PipelineOperation;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@Tag(name = "Pipeline", description = "Pipeline APIs")
+public class PipelineController {
+
+	private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
+	@Autowired
+	private ObjectMapper objectMapper;
+
+	final String jsonFileName = "pipelineConfig.json";
+	final String watchedFoldersDir = "./pipeline/watchedFolders/";
+	final String finishedFoldersDir = "./pipeline/finishedFolders/";
+	
+	@Scheduled(fixedRate = 25000)
+	public void scanFolders() {
+		logger.info("Scanning folders...");
+		Path watchedFolderPath = Paths.get(watchedFoldersDir);
+		if (!Files.exists(watchedFolderPath)) {
+			try {
+				Files.createDirectories(watchedFolderPath);
+				logger.info("Created directory: {}", watchedFolderPath);
+			} catch (IOException e) {
+				logger.error("Error creating directory: {}", watchedFolderPath, e);
+				return;
+			}
+		}
+		try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
+			paths.filter(Files::isDirectory).forEach(t -> {
+				try {
+					if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
+						handleDirectory(t);
+					}
+				} catch (Exception e) {
+					logger.error("Error handling directory: {}", t, e);
+				}
+			});
+		} catch (Exception e) {
+			logger.error("Error walking through directory: {}", watchedFolderPath, e);
+		}
+	}
+
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+
+	private void handleDirectory(Path dir) throws Exception {
+		logger.info("Handling directory: {}", dir);
+		Path jsonFile = dir.resolve(jsonFileName);
+		Path processingDir = dir.resolve("processing"); // Directory to move files during processing
+		if (!Files.exists(processingDir)) {
+			Files.createDirectory(processingDir);
+			logger.info("Created processing directory: {}", processingDir);
+		}
+
+		if (Files.exists(jsonFile)) {
+			// Read JSON file
+			String jsonString;
+			try {
+				jsonString = new String(Files.readAllBytes(jsonFile));
+				logger.info("Read JSON file: {}", jsonFile);
+			} catch (IOException e) {
+				logger.error("Error reading JSON file: {}", jsonFile, e);
+				return;
+			}
+
+			// Decode JSON to PipelineConfig
+			PipelineConfig config;
+			try {
+				config = objectMapper.readValue(jsonString, PipelineConfig.class);
+				// Assuming your PipelineConfig class has getters for all necessary fields, you
+				// can perform checks here
+				if (config.getOperations() == null || config.getOutputDir() == null || config.getName() == null) {
+					throw new IOException("Invalid JSON format");
+				}
+			} catch (IOException e) {
+				logger.error("Error parsing PipelineConfig: {}", jsonString, e);
+				return;
+			}
+
+			// For each operation in the pipeline
+			for (PipelineOperation operation : config.getOperations()) {
+				// Collect all files based on fileInput
+				File[] files;
+				String fileInput = (String) operation.getParameters().get("fileInput");
+				if ("automated".equals(fileInput)) {
+					// If fileInput is "automated", process all files in the directory
+					try (Stream<Path> paths = Files.list(dir)) {
+						files = paths
+							    .filter(path -> !Files.isDirectory(path)) // exclude directories
+							    .filter(path -> !path.equals(jsonFile)) // exclude jsonFile
+							    .map(Path::toFile)
+							    .toArray(File[]::new);
+
+					} catch (IOException e) {
+						e.printStackTrace();
+						return;
+					}
+				} else {
+					// If fileInput contains a path, process only this file
+					files = new File[] { new File(fileInput) };
+				}
+
+				// Prepare the files for processing
+				List<File> filesToProcess = new ArrayList<>();
+				for (File file : files) {
+				    logger.info(file.getName());
+				    logger.info("{} to {}",file.toPath(), processingDir.resolve(file.getName()));
+				    Files.move(file.toPath(), processingDir.resolve(file.getName()));
+				    filesToProcess.add(processingDir.resolve(file.getName()).toFile());
+				}
+
+				// Process the files
+				try {
+				    List<Resource> resources = handleFiles(filesToProcess.toArray(new File[0]), jsonString);
+				    
+					if(resources == null) {
+						return;
+					}
+					// Move resultant files and rename them as per config in JSON file
+					for (Resource resource : resources) {
+						String resourceName = resource.getFilename();
+						String baseName = resourceName.substring(0, resourceName.lastIndexOf("."));
+						String extension = resourceName.substring(resourceName.lastIndexOf(".")+1);
+						
+						String outputFileName = config.getOutputPattern().replace("{filename}", baseName);
+						
+						outputFileName = outputFileName.replace("{pipelineName}", config.getName());
+						DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+						outputFileName = outputFileName.replace("{date}", LocalDate.now().format(dateFormatter));
+						DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HHmmss");
+						outputFileName = outputFileName.replace("{time}", LocalTime.now().format(timeFormatter));
+						
+						outputFileName += "." + extension;
+						// {filename} {folder} {date} {tmime} {pipeline}
+						String outputDir = config.getOutputDir();
+
+						String outputFolder = applicationProperties.getAutoPipeline().getOutputFolder();
+
+						if (outputFolder == null || outputFolder.isEmpty()) {
+						    // If the environment variable is not set, use the default value
+						    outputFolder = finishedFoldersDir;
+						}
+						logger.info("outputDir 0={}", outputDir);
+						// Replace the placeholders in the outputDir string
+						outputDir = outputDir.replace("{outputFolder}", outputFolder);
+						outputDir = outputDir.replace("{folderName}", dir.toString());
+						logger.info("outputDir 1={}", outputDir);
+						outputDir = outputDir.replace("\\watchedFolders", "");
+						outputDir = outputDir.replace("//watchedFolders", "");
+						outputDir = outputDir.replace("\\\\watchedFolders", "");
+						outputDir = outputDir.replace("/watchedFolders", "");
+						
+						Path outputPath; 
+						logger.info("outputDir 2={}", outputDir);
+						if (Paths.get(outputDir).isAbsolute()) {
+						    // If it's an absolute path, use it directly
+						    outputPath = Paths.get(outputDir);
+						} else {
+						    // If it's a relative path, make it relative to the current working directory
+						    outputPath = Paths.get(".", outputDir);
+						}
+						
+						logger.info("outputPath={}", outputPath);
+						
+						if (!Files.exists(outputPath)) {
+							try {
+								Files.createDirectories(outputPath);
+								logger.info("Created directory: {}", outputPath);
+							} catch (IOException e) {
+								logger.error("Error creating directory: {}", outputPath, e);
+								return;
+							}
+						}
+						logger.info("outputPath {}", outputPath);	
+						logger.info("outputPath.resolve(outputFileName).toString() {}", outputPath.resolve(outputFileName).toString());	
+						File newFile = new File(outputPath.resolve(outputFileName).toString());
+					    OutputStream os = new FileOutputStream(newFile);
+					    os.write(((ByteArrayResource)resource).getByteArray());
+					    os.close();
+						logger.info("made {}", outputPath.resolve(outputFileName));	
+					}
+
+					// If successful, delete the original files
+					for (File file : filesToProcess) {
+						Files.deleteIfExists(processingDir.resolve(file.getName()));
+					}
+				} catch (Exception e) {
+					// If an error occurs, move the original files back
+					for (File file : filesToProcess) {
+						Files.move(processingDir.resolve(file.getName()), file.toPath());
+					}
+					throw e;
+				}
+			}
+		}
+	}
+
+	List<Resource> processFiles(List<Resource> outputFiles, String jsonString) throws Exception {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode jsonNode = mapper.readTree(jsonString);
+
+		JsonNode pipelineNode = jsonNode.get("pipeline");
+		logger.info("Running pipelineNode: {}", pipelineNode);
+		ByteArrayOutputStream logStream = new ByteArrayOutputStream();
+		PrintStream logPrintStream = new PrintStream(logStream);
+
+		boolean hasErrors = false;
+
+		for (JsonNode operationNode : pipelineNode) {
+			String operation = operationNode.get("operation").asText();
+			logger.info("Running operation: {}", operation);
+			JsonNode parametersNode = operationNode.get("parameters");
+			String inputFileExtension = "";
+			if (operationNode.has("inputFileType")) {
+				inputFileExtension = operationNode.get("inputFileType").asText();
+			} else {
+				inputFileExtension = ".pdf";
+			}
+
+			List<Resource> newOutputFiles = new ArrayList<>();
+			boolean hasInputFileType = false;
+
+			for (Resource file : outputFiles) {
+				if (file.getFilename().endsWith(inputFileExtension)) {
+					hasInputFileType = true;
+					MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+					body.add("fileInput", file);
+
+					Iterator<Map.Entry<String, JsonNode>> parameters = parametersNode.fields();
+					while (parameters.hasNext()) {
+						Map.Entry<String, JsonNode> parameter = parameters.next();
+						body.add(parameter.getKey(), parameter.getValue().asText());
+					}
+
+					HttpHeaders headers = new HttpHeaders();
+					headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+					HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
+
+					RestTemplate restTemplate = new RestTemplate();
+					String url = "http://localhost:8080/" + operation;
+
+					ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
+
+					// If the operation is filter and the response body is null or empty, skip this file
+	                if (operation.startsWith("filter-") && (response.getBody() == null || response.getBody().length == 0)) {
+	                	logger.info("Skipping file due to failing {}", operation);
+	                    continue;
+	                }
+	                
+					if (!response.getStatusCode().equals(HttpStatus.OK)) {
+						logPrintStream.println("Error: " + response.getBody());
+						hasErrors = true;
+						continue;
+					}
+					
+					
+					// Define filename
+	                String filename;
+	                if ("auto-rename".equals(operation)) {
+	                    // If the operation is "auto-rename", generate a new filename.
+	                    // This is a simple example of generating a filename using current timestamp.
+	                    // Modify as per your needs.
+	                    filename = "file_" + System.currentTimeMillis();
+	                } else {
+	                    // Otherwise, keep the original filename.
+	                    filename = file.getFilename();
+	                }
+
+	                // Check if the response body is a zip file
+	                if (isZip(response.getBody())) {
+	                    // Unzip the file and add all the files to the new output files
+	                    newOutputFiles.addAll(unzip(response.getBody()));
+	                } else {
+	                    Resource outputResource = new ByteArrayResource(response.getBody()) {
+	                        @Override
+	                        public String getFilename() {
+	                            return filename;
+	                        }
+	                    };
+	                    newOutputFiles.add(outputResource);
+	                }
+				}
+
+				if (!hasInputFileType) {
+					logPrintStream.println(
+							"No files with extension " + inputFileExtension + " found for operation " + operation);
+					hasErrors = true;
+				}
+
+				outputFiles = newOutputFiles;
+			}
+			logPrintStream.close();
+
+		}
+		if (hasErrors) {
+			logger.error("Errors occurred during processing. Log: {}", logStream.toString());
+		}
+		return outputFiles;
+	}
+
+	List<Resource> handleFiles(File[] files, String jsonString) throws Exception {
+		if(files == null || files.length == 0) {
+			logger.info("No files");
+			return null;
+		}
+			
+		logger.info("Handling files: {} files, with JSON string of length: {}", files.length, jsonString.length());
+		
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode jsonNode = mapper.readTree(jsonString);
+
+		JsonNode pipelineNode = jsonNode.get("pipeline");
+
+		boolean hasErrors = false;
+		List<Resource> outputFiles = new ArrayList<>();
+
+		for (File file : files) {
+		    Path path = Paths.get(file.getAbsolutePath());
+		    System.out.println("Reading file: " + path); // debug statement
+		    
+		    if (Files.exists(path)) {
+		        Resource fileResource = new ByteArrayResource(Files.readAllBytes(path)) {
+		            @Override
+		            public String getFilename() {
+		                return file.getName();
+		            }
+		        };
+		        outputFiles.add(fileResource);
+		    } else {
+		        System.out.println("File not found: " + path); // debug statement
+		    }
+		}
+		logger.info("Files successfully loaded. Starting processing...");
+		return processFiles(outputFiles, jsonString);
+	}
+
+	List<Resource> handleFiles(MultipartFile[] files, String jsonString) throws Exception {
+		if(files == null || files.length == 0) {
+			logger.info("No files");
+			return null;
+		}
+		logger.info("Handling files: {} files, with JSON string of length: {}", files.length, jsonString.length());
+		ObjectMapper mapper = new ObjectMapper();
+		JsonNode jsonNode = mapper.readTree(jsonString);
+
+		JsonNode pipelineNode = jsonNode.get("pipeline");
+
+		boolean hasErrors = false;
+		List<Resource> outputFiles = new ArrayList<>();
+
+		for (MultipartFile file : files) {
+			Resource fileResource = new ByteArrayResource(file.getBytes()) {
+				@Override
+				public String getFilename() {
+					return file.getOriginalFilename();
+				}
+			};
+			outputFiles.add(fileResource);
+		}
+		logger.info("Files successfully loaded. Starting processing...");
+		return processFiles(outputFiles, jsonString);
+	}
+
+	@PostMapping("/handleData")
+	public ResponseEntity<byte[]> handleData(@RequestPart("fileInput") MultipartFile[] files,
+			@RequestParam("json") String jsonString) {
+		logger.info("Received POST request to /handleData with {} files", files.length);
+		try {
+			List<Resource> outputFiles = handleFiles(files, jsonString);
+
+			if (outputFiles != null && outputFiles.size() == 1) {
+				// If there is only one file, return it directly
+				Resource singleFile = outputFiles.get(0);
+				InputStream is = singleFile.getInputStream();
+				byte[] bytes = new byte[(int) singleFile.contentLength()];
+				is.read(bytes);
+				is.close();
+
+				logger.info("Returning single file response...");
+				return WebResponseUtils.bytesToWebResponse(bytes, singleFile.getFilename(),
+						MediaType.APPLICATION_OCTET_STREAM);
+			} else if (outputFiles == null) {
+				return null;
+			}
+
+			// Create a ByteArrayOutputStream to hold the zip
+			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			ZipOutputStream zipOut = new ZipOutputStream(baos);
+
+			// Loop through each file and add it to the zip
+			for (Resource file : outputFiles) {
+				ZipEntry zipEntry = new ZipEntry(file.getFilename());
+				zipOut.putNextEntry(zipEntry);
+
+				// Read the file into a byte array
+				InputStream is = file.getInputStream();
+				byte[] bytes = new byte[(int) file.contentLength()];
+				is.read(bytes);
+
+				// Write the bytes of the file to the zip
+				zipOut.write(bytes, 0, bytes.length);
+				zipOut.closeEntry();
+
+				is.close();
+			}
+
+			zipOut.close();
+
+			logger.info("Returning zipped file response...");
+			return WebResponseUtils.boasToWebResponse(baos, "output.zip", MediaType.APPLICATION_OCTET_STREAM);
+		} catch (Exception e) {
+			logger.error("Error handling data: ", e);
+			return null;
+		}
+	}
+
+	private boolean isZip(byte[] data) {
+		if (data == null || data.length < 4) {
+			return false;
+		}
+
+		// Check the first four bytes of the data against the standard zip magic number
+		return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
+	}
+
+	private List<Resource> unzip(byte[] data) throws IOException {
+		logger.info("Unzipping data of length: {}", data.length);
+		List<Resource> unzippedFiles = new ArrayList<>();
+
+		try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
+				ZipInputStream zis = new ZipInputStream(bais)) {
+
+			ZipEntry entry;
+			while ((entry = zis.getNextEntry()) != null) {
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buffer = new byte[1024];
+				int count;
+
+				while ((count = zis.read(buffer)) != -1) {
+					baos.write(buffer, 0, count);
+				}
+
+				final String filename = entry.getName();
+				Resource fileResource = new ByteArrayResource(baos.toByteArray()) {
+					@Override
+					public String getFilename() {
+						return filename;
+					}
+				};
+
+				// If the unzipped file is a zip file, unzip it
+				if (isZip(baos.toByteArray())) {
+					logger.info("File {} is a zip file. Unzipping...", filename);
+					unzippedFiles.addAll(unzip(baos.toByteArray()));
+				} else {
+					unzippedFiles.add(fileResource);
+				}
+			}
+		}
+
+		logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+		return unzippedFiles;
+	}
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java
@@ -0,0 +1,763 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.pdfbox.cos.COSString;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureElement;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureNode;
+import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureTreeRoot;
+import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+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 com.itextpdf.forms.PdfAcroForm;
+import com.itextpdf.forms.fields.PdfFormField;
+import com.itextpdf.kernel.geom.Rectangle;
+import com.itextpdf.kernel.pdf.PdfArray;
+import com.itextpdf.kernel.pdf.PdfCatalog;
+import com.itextpdf.kernel.pdf.PdfDictionary;
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfName;
+import com.itextpdf.kernel.pdf.PdfObject;
+import com.itextpdf.kernel.pdf.PdfOutline;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.PdfResources;
+import com.itextpdf.kernel.pdf.PdfStream;
+import com.itextpdf.kernel.pdf.PdfString;
+import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
+import com.itextpdf.kernel.pdf.annot.PdfFileAttachmentAnnotation;
+import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
+import com.itextpdf.kernel.pdf.layer.PdfLayer;
+import com.itextpdf.kernel.pdf.layer.PdfOCProperties;
+import com.itextpdf.kernel.xmp.XMPException;
+import com.itextpdf.kernel.xmp.XMPMeta;
+import com.itextpdf.kernel.xmp.XMPMetaFactory;
+import com.itextpdf.kernel.xmp.options.SerializeOptions;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@Tag(name = "Security", description = "Security APIs")
+public class GetInfoOnPDF {
+	
+	static ObjectMapper objectMapper = new ObjectMapper();
+
+	@PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
+    @Operation(summary = "Summary here", description = "desc. Input:PDF Output:JSON Type:SISO")
+    public ResponseEntity<byte[]> getPdfInfo(
+            @RequestPart(required = true, value = "fileInput") 
+            @Parameter(description = "The input PDF file to get info on", required = true) MultipartFile inputFile)
+            throws IOException {
+		
+		try (
+			    PDDocument pdfBoxDoc = PDDocument.load(inputFile.getInputStream());
+			    PdfDocument itextDoc = new PdfDocument(new PdfReader(inputFile.getInputStream()))
+			) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            ObjectNode jsonOutput = objectMapper.createObjectNode();
+
+            // Metadata using PDFBox
+            PDDocumentInformation info = pdfBoxDoc.getDocumentInformation();
+            ObjectNode metadata = objectMapper.createObjectNode();
+            ObjectNode basicInfo = objectMapper.createObjectNode();
+            ObjectNode docInfoNode = objectMapper.createObjectNode();
+            ObjectNode compliancy = objectMapper.createObjectNode();
+            ObjectNode encryption = objectMapper.createObjectNode();
+            ObjectNode other = objectMapper.createObjectNode();
+            
+            
+            metadata.put("Title", info.getTitle());
+            metadata.put("Author", info.getAuthor());
+            metadata.put("Subject", info.getSubject());
+            metadata.put("Keywords", info.getKeywords());
+            metadata.put("Producer", info.getProducer());
+            metadata.put("Creator", info.getCreator());
+            metadata.put("CreationDate", formatDate(info.getCreationDate()));
+            metadata.put("ModificationDate", formatDate(info.getModificationDate()));
+            jsonOutput.set("Metadata", metadata);
+            
+            
+            
+            
+            // Total file size of the PDF
+            long fileSizeInBytes = inputFile.getSize();
+            basicInfo.put("FileSizeInBytes", fileSizeInBytes);
+            
+            // Number of words, paragraphs, and images in the entire document
+            String fullText = new PDFTextStripper().getText(pdfBoxDoc);
+            String[] words = fullText.split("\\s+");
+            int wordCount = words.length;
+            int paragraphCount = fullText.split("\r\n|\r|\n").length;
+            basicInfo.put("WordCount", wordCount);
+            basicInfo.put("ParagraphCount", paragraphCount);
+            // Number of characters in the entire document (including spaces and special characters)
+            int charCount = fullText.length();
+            basicInfo.put("CharacterCount", charCount);
+            
+            
+            // Initialize the flags and types
+            boolean hasCompression = false;
+            String compressionType = "None";
+
+            // Check for object streams
+            for (int i = 1; i <= itextDoc.getNumberOfPdfObjects(); i++) {
+                PdfObject obj = itextDoc.getPdfObject(i);
+                if (obj != null && obj.isStream() && ((PdfStream) obj).get(PdfName.Type) == PdfName.ObjStm) {
+                    hasCompression = true;
+                    compressionType = "Object Streams";
+                    break;
+                }
+            }
+
+            // If not compressed using object streams, check for compressed Xref tables
+            if (!hasCompression && itextDoc.getReader().hasRebuiltXref()) {
+                hasCompression = true;
+                compressionType = "Compressed Xref or Rebuilt Xref";
+            }
+            basicInfo.put("Compression", hasCompression);
+            if(hasCompression)
+            	basicInfo.put("CompressionType", compressionType);
+            
+            String language = pdfBoxDoc.getDocumentCatalog().getLanguage();
+            basicInfo.put("Language", language);
+            basicInfo.put("Number of pages", pdfBoxDoc.getNumberOfPages());
+            
+            
+            // Page Mode using iText7
+            PdfCatalog catalog = itextDoc.getCatalog();
+            PdfName pageMode = catalog.getPdfObject().getAsName(PdfName.PageMode);
+            
+            // Document Information using PDFBox
+            docInfoNode.put("PDF version", pdfBoxDoc.getVersion());
+            docInfoNode.put("Trapped", info.getTrapped());
+            docInfoNode.put("Page Mode", getPageModeDescription(pageMode));;
+            
+
+            
+            
+            
+            PdfAcroForm acroForm = PdfAcroForm.getAcroForm(itextDoc, false);
+            ObjectNode formFieldsNode = objectMapper.createObjectNode();
+            if (acroForm != null) {
+                for (Map.Entry<String, PdfFormField> entry : acroForm.getFormFields().entrySet()) {
+                    formFieldsNode.put(entry.getKey(), entry.getValue().getValueAsString());
+                }
+            }
+            jsonOutput.set("FormFields", formFieldsNode);
+           
+            
+            
+            
+            
+            //embeed files TODO size
+            ArrayNode embeddedFilesArray = objectMapper.createArrayNode();
+            if(itextDoc.getCatalog().getPdfObject().getAsDictionary(PdfName.Names) != null)
+            {
+            PdfDictionary embeddedFiles = itextDoc.getCatalog().getPdfObject().getAsDictionary(PdfName.Names)
+                    .getAsDictionary(PdfName.EmbeddedFiles);
+            if (embeddedFiles != null) {
+                
+                PdfArray namesArray = embeddedFiles.getAsArray(PdfName.Names);
+                if(namesArray != null) {
+	                for (int i = 0; i < namesArray.size(); i += 2) {
+	                    ObjectNode embeddedFileNode = objectMapper.createObjectNode();
+	                    embeddedFileNode.put("Name", namesArray.getAsString(i).toString());
+	                    // Add other details if required
+	                    embeddedFilesArray.add(embeddedFileNode);
+	                }
+                }
+                
+            }
+            }
+            other.set("EmbeddedFiles", embeddedFilesArray);
+            
+            //attachments TODO size
+            ArrayNode attachmentsArray = objectMapper.createArrayNode();
+            for (int pageNum = 1; pageNum <= itextDoc.getNumberOfPages(); pageNum++) {
+                for (PdfAnnotation annotation : itextDoc.getPage(pageNum).getAnnotations()) {
+                    if (annotation instanceof PdfFileAttachmentAnnotation) {
+                        ObjectNode attachmentNode = objectMapper.createObjectNode();
+                        attachmentNode.put("Name", ((PdfFileAttachmentAnnotation) annotation).getName().toString());
+                        attachmentNode.put("Description", annotation.getContents().getValue());
+                        attachmentsArray.add(attachmentNode);
+                    }
+                }
+            }
+            other.set("Attachments", attachmentsArray);
+
+            //Javascript
+            PdfDictionary namesDict = itextDoc.getCatalog().getPdfObject().getAsDictionary(PdfName.Names);
+            ArrayNode javascriptArray = objectMapper.createArrayNode();
+            if (namesDict != null) {
+                PdfDictionary javascriptDict = namesDict.getAsDictionary(PdfName.JavaScript);
+                if (javascriptDict != null) {
+
+                    PdfArray namesArray = javascriptDict.getAsArray(PdfName.Names);
+                    for (int i = 0; i < namesArray.size(); i += 2) {
+                        ObjectNode jsNode = objectMapper.createObjectNode();
+                        if(namesArray.getAsString(i) != null)
+                            jsNode.put("JS Name", namesArray.getAsString(i).toString());
+
+                        // Here we check for a PdfStream object and retrieve the JS code from it
+                        PdfObject jsCode = namesArray.get(i+1);
+                        if (jsCode instanceof PdfStream) {
+                            byte[] jsCodeBytes = ((PdfStream)jsCode).getBytes();
+                            String jsCodeStr = new String(jsCodeBytes, StandardCharsets.UTF_8);
+                            jsNode.put("JS Script Length", jsCodeStr.length());
+                        } else if (jsCode instanceof PdfDictionary) {
+                            // If the JS code is in a dictionary, you'll need to know the key to use.
+                            // Assuming the key is PdfName.JS:
+                            PdfStream jsCodeStream = ((PdfDictionary)jsCode).getAsStream(PdfName.JS);
+                            if (jsCodeStream != null) {
+                                byte[] jsCodeBytes = jsCodeStream.getBytes();
+                                String jsCodeStr = new String(jsCodeBytes, StandardCharsets.UTF_8);
+                                jsNode.put("JS Script Character Length", jsCodeStr.length());
+                            }
+                        }
+
+                        javascriptArray.add(jsNode);
+                    }
+
+                }
+            }
+            other.set("JavaScript", javascriptArray);
+            
+            //TODO size
+            PdfOCProperties ocProperties = itextDoc.getCatalog().getOCProperties(false);
+            ArrayNode layersArray = objectMapper.createArrayNode();
+            if (ocProperties != null) {
+               
+                for (PdfLayer layer : ocProperties.getLayers()) {
+                    ObjectNode layerNode = objectMapper.createObjectNode();
+                    layerNode.put("Name", layer.getPdfObject().getAsString(PdfName.Name).toString());
+                    layersArray.add(layerNode);
+                }
+                
+            }
+            other.set("Layers", layersArray);
+            
+            //TODO Security
+            
+
+            
+            
+            
+            
+            // Digital Signatures using iText7 TODO
+            
+
+            
+            
+            PDStructureTreeRoot structureTreeRoot = pdfBoxDoc.getDocumentCatalog().getStructureTreeRoot();
+            ArrayNode structureTreeArray;
+			try {
+				if(structureTreeRoot != null) {
+					structureTreeArray = exploreStructureTree(structureTreeRoot.getKids());
+					other.set("StructureTree", structureTreeArray);
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+            
+            
+            boolean isPdfACompliant = checkOutputIntent(itextDoc, "PDF/A");
+            boolean isPdfXCompliant = checkOutputIntent(itextDoc, "PDF/X");
+            boolean isPdfECompliant = checkForStandard(itextDoc, "PDF/E");
+            boolean isPdfVTCompliant = checkForStandard(itextDoc, "PDF/VT");
+            boolean isPdfUACompliant = checkForStandard(itextDoc, "PDF/UA");
+            boolean isPdfBCompliant = checkForStandard(itextDoc, "PDF/B"); // If you want to check for PDF/Broadcast, though this isn't an official ISO standard.
+            boolean isPdfSECCompliant = checkForStandard(itextDoc, "PDF/SEC"); // This might not be effective since PDF/SEC was under development in 2021.
+            
+            compliancy.put("IsPDF/ACompliant", isPdfACompliant);
+            compliancy.put("IsPDF/XCompliant", isPdfXCompliant);
+            compliancy.put("IsPDF/ECompliant", isPdfECompliant);
+            compliancy.put("IsPDF/VTCompliant", isPdfVTCompliant);
+            compliancy.put("IsPDF/UACompliant", isPdfUACompliant);
+            compliancy.put("IsPDF/BCompliant", isPdfBCompliant);
+            compliancy.put("IsPDF/SECCompliant", isPdfSECCompliant);
+
+     
+            
+           
+            
+            ArrayNode bookmarksArray = objectMapper.createArrayNode();
+            PdfOutline root = itextDoc.getOutlines(false);
+            if (root != null) {
+                for (PdfOutline child : root.getAllChildren()) {
+                    addOutlinesToArray(child, bookmarksArray);
+                }
+            }
+            other.set("Bookmarks/Outline/TOC", bookmarksArray);
+            
+            byte[] xmpBytes = itextDoc.getXmpMetadata();
+            String xmpString = null;
+            if (xmpBytes != null) {
+                try {
+                    XMPMeta xmpMeta = XMPMetaFactory.parseFromBuffer(xmpBytes);
+                    xmpString = new String(XMPMetaFactory.serializeToBuffer(xmpMeta, new SerializeOptions()));
+                } catch (XMPException e) {
+                    e.printStackTrace();
+                }
+            }
+            other.put("XMPMetadata", xmpString);
+            
+            
+            
+            if (pdfBoxDoc.isEncrypted()) {
+            	encryption.put("IsEncrypted", true);
+
+                // Retrieve encryption details using getEncryption()
+                PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
+                encryption.put("EncryptionAlgorithm", pdfEncryption.getFilter());
+                encryption.put("KeyLength", pdfEncryption.getLength());
+                encryption.put("Permissions", pdfBoxDoc.getCurrentAccessPermission().toString());
+                
+                // Add other encryption-related properties as needed
+            } else {
+            	encryption.put("IsEncrypted", false);
+            }
+            
+            
+            
+
+            ObjectNode pageInfoParent = objectMapper.createObjectNode();
+            for (int pageNum = 1; pageNum <= itextDoc.getNumberOfPages(); pageNum++) {
+                ObjectNode pageInfo = objectMapper.createObjectNode();
+
+                // Page-level Information
+                Rectangle pageSize = itextDoc.getPage(pageNum).getPageSize();
+                pageInfo.put("Width", pageSize.getWidth());
+                pageInfo.put("Height", pageSize.getHeight());
+                pageInfo.put("Rotation", itextDoc.getPage(pageNum).getRotation());
+                pageInfo.put("Page Orientation", getPageOrientation(pageSize.getWidth(),pageSize.getHeight())); 
+                pageInfo.put("Standard Size", getPageSize(pageSize.getWidth(),pageSize.getHeight())); 
+                
+                // Boxes
+                pageInfo.put("MediaBox", itextDoc.getPage(pageNum).getMediaBox().toString());
+                pageInfo.put("CropBox", itextDoc.getPage(pageNum).getCropBox().toString());
+                pageInfo.put("BleedBox", itextDoc.getPage(pageNum).getBleedBox().toString());
+                pageInfo.put("TrimBox", itextDoc.getPage(pageNum).getTrimBox().toString());
+                pageInfo.put("ArtBox", itextDoc.getPage(pageNum).getArtBox().toString());
+
+                // Content Extraction
+                PDFTextStripper textStripper = new PDFTextStripper();
+                textStripper.setStartPage(pageNum -1);
+                textStripper.setEndPage(pageNum - 1);
+                String pageText = textStripper.getText(pdfBoxDoc);
+                
+                pageInfo.put("Text Characters Count", pageText.length()); //
+
+             // Annotations
+                List<PdfAnnotation> annotations = itextDoc.getPage(pageNum).getAnnotations();
+
+                int subtypeCount = 0;
+                int contentsCount = 0;
+
+                for (PdfAnnotation annotation : annotations) {
+                    if(annotation.getSubtype() != null) {
+                        subtypeCount++;  // Increase subtype count
+                    }
+                    if(annotation.getContents() != null) {
+                        contentsCount++;  // Increase contents count
+                    }
+                }
+
+                ObjectNode annotationsObject = objectMapper.createObjectNode();
+                annotationsObject.put("AnnotationsCount", annotations.size());
+                annotationsObject.put("SubtypeCount", subtypeCount);
+                annotationsObject.put("ContentsCount", contentsCount);
+                pageInfo.set("Annotations", annotationsObject);
+                
+                // Images (simplified)
+                // This part is non-trivial as images can be embedded in multiple ways in a PDF.
+                // Here is a basic structure to recognize image XObjects on a page.
+                ArrayNode imagesArray = objectMapper.createArrayNode();
+                PdfResources resources = itextDoc.getPage(pageNum).getResources();
+                for (PdfName name : resources.getResourceNames()) {
+                    PdfObject obj = resources.getResource(name);
+                    if (obj instanceof PdfStream) {
+                        PdfStream stream = (PdfStream) obj;
+                        if (PdfName.Image.equals(stream.getAsName(PdfName.Subtype))) {
+                            ObjectNode imageNode = objectMapper.createObjectNode();
+                            imageNode.put("Width", stream.getAsNumber(PdfName.Width).intValue());
+                            imageNode.put("Height", stream.getAsNumber(PdfName.Height).intValue());
+                            PdfObject colorSpace = stream.get(PdfName.ColorSpace);
+                            if (colorSpace != null) {
+                                imageNode.put("ColorSpace", colorSpace.toString());
+                            }
+                            imagesArray.add(imageNode);
+                        }
+                    }
+                }
+                pageInfo.set("Images", imagesArray);
+
+                
+                // Links
+                ArrayNode linksArray = objectMapper.createArrayNode();
+                Set<String> uniqueURIs = new HashSet<>();  // To store unique URIs
+
+                for (PdfAnnotation annotation : annotations) {
+                    if (annotation instanceof PdfLinkAnnotation) {
+                        PdfLinkAnnotation linkAnnotation = (PdfLinkAnnotation) annotation;
+                        if(linkAnnotation != null && linkAnnotation.getAction() != null) {
+	                        String uri = linkAnnotation.getAction().toString();
+	                        uniqueURIs.add(uri);  // Add to set to ensure uniqueness
+                        }
+                    }
+                }
+
+                // Add unique URIs to linksArray
+                for (String uri : uniqueURIs) {
+                    ObjectNode linkNode = objectMapper.createObjectNode();
+                    linkNode.put("URI", uri);
+                    linksArray.add(linkNode);
+                }
+                pageInfo.set("Links", linksArray);
+                
+             // Fonts
+                ArrayNode fontsArray = objectMapper.createArrayNode();
+                PdfDictionary fontDicts = resources.getResource(PdfName.Font);
+                Set<String> uniqueSubtypes = new HashSet<>(); // To store unique subtypes
+
+                // Map to store unique fonts and their counts
+                Map<String, ObjectNode> uniqueFontsMap = new HashMap<>();
+
+                if (fontDicts != null) {
+                    for (PdfName key : fontDicts.keySet()) {
+                        ObjectNode fontNode = objectMapper.createObjectNode(); // Create a new font node for each font
+                        PdfDictionary font = fontDicts.getAsDictionary(key);
+
+                        boolean isEmbedded = font.containsKey(PdfName.FontFile) ||
+                                font.containsKey(PdfName.FontFile2) ||
+                                font.containsKey(PdfName.FontFile3);
+                        fontNode.put("IsEmbedded", isEmbedded);
+
+                        if (font.containsKey(PdfName.Encoding)) {
+                            String encoding = font.getAsName(PdfName.Encoding).toString();
+                            fontNode.put("Encoding", encoding);
+                        }
+
+                        if (font.getAsString(PdfName.BaseFont) != null) {
+                            fontNode.put("Name", font.getAsString(PdfName.BaseFont).toString());
+                        }
+
+                        String subtype = null;
+                        if (font.containsKey(PdfName.Subtype)) {
+                            subtype = font.getAsName(PdfName.Subtype).toString();
+                            uniqueSubtypes.add(subtype);  // Add to set to ensure uniqueness
+                        }
+                        fontNode.put("Subtype", subtype);
+
+                        PdfDictionary fontDescriptor = font.getAsDictionary(PdfName.FontDescriptor);
+                        if (fontDescriptor != null) {
+                            if (fontDescriptor.containsKey(PdfName.ItalicAngle)) {
+                                fontNode.put("ItalicAngle", fontDescriptor.getAsNumber(PdfName.ItalicAngle).floatValue());
+                            }
+
+                            if (fontDescriptor.containsKey(PdfName.Flags)) {
+                                int flags = fontDescriptor.getAsNumber(PdfName.Flags).intValue();
+                                fontNode.put("IsItalic", (flags & 64) != 0);
+                                fontNode.put("IsBold", (flags & 1 << 16) != 0);
+                                fontNode.put("IsFixedPitch", (flags & 1) != 0);
+                                fontNode.put("IsSerif", (flags & 2) != 0);
+                                fontNode.put("IsSymbolic", (flags & 4) != 0);
+                                fontNode.put("IsScript", (flags & 8) != 0);
+                                fontNode.put("IsNonsymbolic", (flags & 16) != 0);
+                            }
+
+                            if (fontDescriptor.containsKey(PdfName.FontFamily)) {
+                                String fontFamily = fontDescriptor.getAsString(PdfName.FontFamily).toString();
+                                fontNode.put("FontFamily", fontFamily);
+                            }
+
+                            if (fontDescriptor.containsKey(PdfName.FontStretch)) {
+                                String fontStretch = fontDescriptor.getAsName(PdfName.FontStretch).toString();
+                                fontNode.put("FontStretch", fontStretch);
+                            }
+
+                            if (fontDescriptor.containsKey(PdfName.FontBBox)) {
+                                PdfArray bbox = fontDescriptor.getAsArray(PdfName.FontBBox);
+                                fontNode.put("FontBoundingBox", bbox.toString());
+                            }
+
+                            if (fontDescriptor.containsKey(PdfName.FontWeight)) {
+                                float fontWeight = fontDescriptor.getAsNumber(PdfName.FontWeight).floatValue();
+                                fontNode.put("FontWeight", fontWeight);
+                            }
+                        }
+
+                        if (font.containsKey(PdfName.ToUnicode)) {
+                            fontNode.put("HasToUnicodeMap", true);
+                        }
+
+                        if (fontNode.size() > 0) {
+                            // Create a unique key for this font node based on its attributes
+                            String uniqueKey = fontNode.toString(); 
+
+                            // Increment count if this font exists, or initialize it if new
+                            if (uniqueFontsMap.containsKey(uniqueKey)) {
+                                ObjectNode existingFontNode = uniqueFontsMap.get(uniqueKey);
+                                int count = existingFontNode.get("Count").asInt() + 1;
+                                existingFontNode.put("Count", count);
+                            } else {
+                                fontNode.put("Count", 1);
+                                uniqueFontsMap.put(uniqueKey, fontNode);
+                            }
+                        }
+                    }
+                }
+
+                // Add unique font entries to fontsArray
+                for (ObjectNode uniqueFontNode : uniqueFontsMap.values()) {
+                    fontsArray.add(uniqueFontNode);
+                }
+
+                pageInfo.set("Fonts", fontsArray);
+                
+                
+                
+                
+             // Access resources dictionary
+                PdfDictionary resourcesDict = itextDoc.getPage(pageNum).getResources().getPdfObject();
+
+                // Color Spaces & ICC Profiles
+                ArrayNode colorSpacesArray = objectMapper.createArrayNode();
+                PdfDictionary colorSpaces = resourcesDict.getAsDictionary(PdfName.ColorSpace);
+                if (colorSpaces != null) {
+                    for (PdfName name : colorSpaces.keySet()) {
+                        PdfObject colorSpaceObject = colorSpaces.get(name);
+                        if (colorSpaceObject instanceof PdfArray) {
+                            PdfArray colorSpaceArray = (PdfArray) colorSpaceObject;
+                            if (colorSpaceArray.size() > 1 && colorSpaceArray.get(0) instanceof PdfName && PdfName.ICCBased.equals(colorSpaceArray.get(0))) {
+                                ObjectNode iccProfileNode = objectMapper.createObjectNode();
+                                PdfStream iccStream = (PdfStream) colorSpaceArray.get(1);
+                                byte[] iccData = iccStream.getBytes();
+                                // TODO: Further decode and analyze the ICC data if needed
+                                iccProfileNode.put("ICC Profile Length", iccData.length);
+                                colorSpacesArray.add(iccProfileNode);
+                            }
+                        }
+                    }
+                }
+                pageInfo.set("Color Spaces & ICC Profiles", colorSpacesArray);
+
+                // Other XObjects
+                Map<String, Integer> xObjectCountMap = new HashMap<>();  // To store the count for each type
+                PdfDictionary xObjects = resourcesDict.getAsDictionary(PdfName.XObject);
+                if (xObjects != null) {
+                    for (PdfName name : xObjects.keySet()) {
+                        PdfStream xObjectStream = xObjects.getAsStream(name);
+                        String xObjectType = xObjectStream.getAsName(PdfName.Subtype).toString();
+
+                        // Increment the count for this type in the map
+                        xObjectCountMap.put(xObjectType, xObjectCountMap.getOrDefault(xObjectType, 0) + 1);
+                    }
+                }
+
+                // Add the count map to pageInfo (or wherever you want to store it)
+                ObjectNode xObjectCountNode = objectMapper.createObjectNode();
+                for (Map.Entry<String, Integer> entry : xObjectCountMap.entrySet()) {
+                    xObjectCountNode.put(entry.getKey(), entry.getValue());
+                }
+                pageInfo.set("XObjectCounts", xObjectCountNode);
+                
+         
+
+                ArrayNode multimediaArray = objectMapper.createArrayNode();
+                for (PdfAnnotation annotation : annotations) {
+                    if (PdfName.RichMedia.equals(annotation.getSubtype())) {
+                        ObjectNode multimediaNode = objectMapper.createObjectNode();
+                        // Extract details from the dictionary as needed
+                        multimediaArray.add(multimediaNode);
+                    }
+                }
+                pageInfo.set("Multimedia", multimediaArray);
+
+                
+
+                pageInfoParent.set("Page " + pageNum, pageInfo);
+            }
+
+            
+            jsonOutput.set("BasicInfo", basicInfo);
+            jsonOutput.set("DocumentInfo", docInfoNode);
+            jsonOutput.set("Compliancy", compliancy);
+            jsonOutput.set("Encryption", encryption);
+            jsonOutput.set("Other", other);
+            jsonOutput.set("PerPageInfo", pageInfoParent);
+            
+            
+            
+            // Save JSON to file
+            String jsonString = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonOutput);
+            
+            
+            
+            return WebResponseUtils.bytesToWebResponse(jsonString.getBytes(StandardCharsets.UTF_8), "response.json", MediaType.APPLICATION_JSON);
+            
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+		return null;
+    }
+
+    private static void addOutlinesToArray(PdfOutline outline, ArrayNode arrayNode) {
+        if (outline == null) return;
+        ObjectNode outlineNode = objectMapper.createObjectNode();
+        outlineNode.put("Title", outline.getTitle());
+        // You can add other properties if needed
+        arrayNode.add(outlineNode);
+        
+        for (PdfOutline child : outline.getAllChildren()) {
+            addOutlinesToArray(child, arrayNode);
+        }
+    }
+    public String getPageOrientation(double width, double height) {        
+        if (width > height) {
+            return "Landscape";
+        } else if (height > width) {
+            return "Portrait";
+        } else {
+            return "Square";
+        }
+    }
+    public String getPageSize(double width, double height) {
+        // Common aspect ratios used for standard paper sizes
+        double[] aspectRatios = {4.0 / 3.0, 3.0 / 2.0, Math.sqrt(2.0), 16.0 / 9.0};
+
+        // Check if the page matches any common aspect ratio
+        for (double aspectRatio : aspectRatios) {
+            if (isCloseToAspectRatio(width, height, aspectRatio)) {
+                return "Standard";
+            }
+        }
+
+        // If not a standard aspect ratio, consider it as a custom size
+        return "Custom";
+    }
+    private boolean isCloseToAspectRatio(double width, double height, double aspectRatio) {
+        // Calculate the aspect ratio of the page
+        double pageAspectRatio = width / height;
+
+        // Compare the page aspect ratio with the common aspect ratio within a threshold
+        return Math.abs(pageAspectRatio - aspectRatio) <= 0.05;
+    }
+    
+    public boolean checkForStandard(PdfDocument document, String standardKeyword) {
+        // Check Output Intents
+        boolean foundInOutputIntents = checkOutputIntent(document, standardKeyword);
+        if (foundInOutputIntents) return true;
+
+        // Check XMP Metadata (rudimentary)
+        try {
+            byte[] metadataBytes = document.getXmpMetadata();
+            if (metadataBytes != null) {
+                XMPMeta xmpMeta = XMPMetaFactory.parseFromBuffer(metadataBytes);
+                String xmpString = xmpMeta.dumpObject();
+                if (xmpString.contains(standardKeyword)) {
+                    return true;
+                }
+            }
+        } catch (XMPException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
+
+
+    public boolean checkOutputIntent(PdfDocument document, String standard) {
+        PdfArray outputIntents = document.getCatalog().getPdfObject().getAsArray(PdfName.OutputIntents);
+        if (outputIntents != null && !outputIntents.isEmpty()) {
+            for (int i = 0; i < outputIntents.size(); i++) {
+                PdfDictionary outputIntentDict = outputIntents.getAsDictionary(i);
+                if (outputIntentDict != null) {
+                    PdfString s = outputIntentDict.getAsString(PdfName.S);
+                    if (s != null && s.toString().contains(standard)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    
+    public ArrayNode exploreStructureTree(List<Object> nodes) {
+        ArrayNode elementsArray = objectMapper.createArrayNode();
+        if (nodes != null) {
+            for (Object obj : nodes) {
+                if (obj instanceof PDStructureNode) {
+                    PDStructureNode node = (PDStructureNode) obj;
+                    ObjectNode elementNode = objectMapper.createObjectNode();
+
+                    if (node instanceof PDStructureElement) {
+                        PDStructureElement structureElement = (PDStructureElement) node;
+                        elementNode.put("Type", structureElement.getStructureType());
+                        elementNode.put("Content", getContent(structureElement));
+
+                        // Recursively explore child elements
+                        ArrayNode childElements = exploreStructureTree(structureElement.getKids());
+                        if (childElements.size() > 0) {
+                            elementNode.set("Children", childElements);
+                        }
+                    }
+                    elementsArray.add(elementNode);
+                }
+            }
+        }
+        return elementsArray;
+    }
+
+
+    public String getContent(PDStructureElement structureElement) {
+        StringBuilder contentBuilder = new StringBuilder();
+
+        for (Object item : structureElement.getKids()) {
+            if (item instanceof COSString) {
+                COSString cosString = (COSString) item;
+                contentBuilder.append(cosString.getString());
+            } else if (item instanceof PDStructureElement) {
+                // For simplicity, we're handling only COSString and PDStructureElement here
+                // but a more comprehensive method would handle other types too
+                contentBuilder.append(getContent((PDStructureElement) item));
+            }
+        }
+
+        return contentBuilder.toString();
+    }
+    
+    
+    private String formatDate(Calendar calendar) {
+        if (calendar != null) {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            return sdf.format(calendar.getTime());
+        } else {
+            return null;
+        }
+    }
+
+    private String getPageModeDescription(PdfName pageMode) {
+        return pageMode != null ? pageMode.toString().replaceFirst("/", "") : "Unknown";
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java
@@ -52,37 +52,37 @@ public class PasswordController {
        @RequestPart(required = true, value = "fileInput")
        @Parameter(description = "The input PDF file to which the password should be added", required = true)
            MultipartFile fileInput,
-        @RequestParam(defaultValue = "", name = "ownerPassword")
+            @RequestParam(value = "", name = "ownerPassword", required = false, defaultValue = "")
        @Parameter(description = "The owner password to be added to the PDF file (Restricts what can be done with the document once it is opened)")
            String ownerPassword,
-        @RequestParam(defaultValue = "", name = "password")
+            @RequestParam( name = "password", required = false, defaultValue = "")
        @Parameter(description = "The password to be added to the PDF file (Restricts the opening of the document itself.)")
            String password,
-        @RequestParam(defaultValue = "128", name = "keyLength")
+            @RequestParam( name = "keyLength", required = false, defaultValue = "256")
        @Parameter(description = "The length of the encryption key", schema = @Schema(allowableValues = {"40", "128", "256"}))
            int keyLength,
-        @RequestParam(defaultValue = "false", name = "canAssembleDocument")
+            @RequestParam( name = "canAssembleDocument", required = false)
        @Parameter(description = "Whether the document assembly is allowed", example = "false")
            boolean canAssembleDocument,
-        @RequestParam(defaultValue = "false", name = "canExtractContent")
+            @RequestParam( name = "canExtractContent", required = false)
        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
            boolean canExtractContent,
-        @RequestParam(defaultValue = "false", name = "canExtractForAccessibility")
+            @RequestParam( name = "canExtractForAccessibility", required = false)
        @Parameter(description = "Whether content extraction for accessibility is allowed", example = "false")
            boolean canExtractForAccessibility,
-        @RequestParam(defaultValue = "false", name = "canFillInForm")
+            @RequestParam( name = "canFillInForm", required = false)
        @Parameter(description = "Whether form filling is allowed", example = "false")
            boolean canFillInForm,
-        @RequestParam(defaultValue = "false", name = "canModify")
+            @RequestParam( name = "canModify", required = false)
        @Parameter(description = "Whether the document modification is allowed", example = "false")
            boolean canModify,
-        @RequestParam(defaultValue = "false", name = "canModifyAnnotations")
+            @RequestParam( name = "canModifyAnnotations", required = false)
        @Parameter(description = "Whether modification of annotations is allowed", example = "false")
            boolean canModifyAnnotations,
-        @RequestParam(defaultValue = "false", name = "canPrint")
+            @RequestParam(name = "canPrint", required = false)
        @Parameter(description = "Whether printing of the document is allowed", example = "false")
            boolean canPrint,
-        @RequestParam(defaultValue = "false", name = "canPrintFaithful")
+            @RequestParam( name = "canPrintFaithful", required = false)
        @Parameter(description = "Whether faithful printing is allowed", example = "false")
            boolean canPrintFaithful
    ) throws IOException {
@@ -98,15 +98,15 @@ public class PasswordController {
        ap.setCanPrint(!canPrint);
        ap.setCanPrintFaithful(!canPrintFaithful);
        StandardProtectionPolicy spp = new StandardProtectionPolicy(ownerPassword, password, ap);
-        
-     
-        
-        spp.setEncryptionKeyLength(keyLength);

+        if(!"".equals(ownerPassword) || !"".equals(password)) {
+        	spp.setEncryptionKeyLength(keyLength);
+        }
        spp.setPermissions(ap);
-
        document.protect(spp);

+        if("".equals(ownerPassword) && "".equals(password))
+        	return WebResponseUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_permissions.pdf");
        return WebResponseUtils.pdfDocToWebResponse(document, fileInput.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_passworded.pdf");
    }

--- a/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java
@@ -0,0 +1,106 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.awt.Color;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+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.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.PDFText;
+import stirling.software.SPDF.pdf.TextFinder;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@Tag(name = "Security", description = "Security APIs")
+public class RedactController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RedactController.class);
+
+
+    @PostMapping(value = "/auto-redact", consumes = "multipart/form-data")
+    @Operation(summary = "Redacts listOfText in a PDF document", 
+               description = "This operation takes an input PDF file and redacts the provided listOfText. Input:PDF, Output:PDF, Type:SISO")
+    public ResponseEntity<byte[]> redactPdf(
+            @Parameter(description = "The input PDF file", required = true) @RequestParam("fileInput") MultipartFile file,
+            @Parameter(description = "List of listOfText to redact from the PDF", required = true, schema = @Schema(type = "string")) @RequestParam("listOfText") String listOfTextString,
+            @RequestParam(value = "useRegex", required = false) boolean useRegex,
+            @RequestParam(value = "wholeWordSearch", required = false) boolean wholeWordSearchBool,
+            @RequestParam(value = "customPadding", required = false) float customPadding,
+            @RequestParam(value = "convertPDFToImage", required = false) boolean convertPDFToImage) throws Exception {
+        
+    	System.out.println(listOfTextString);
+    	String[] listOfText = listOfTextString.split("\n");
+        byte[] bytes = file.getBytes();
+        PDDocument document = PDDocument.load(new ByteArrayInputStream(bytes));
+        for (String text : listOfText) {
+        	text = text.trim();
+        	System.out.println(text);
+        	TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
+            List<PDFText> foundTexts = textFinder.getTextLocations(document);
+            redactFoundText(document, foundTexts, customPadding);
+        }
+        
+        
+        
+        if (convertPDFToImage) {
+            PDDocument imageDocument = new PDDocument();
+            PDFRenderer pdfRenderer = new PDFRenderer(document);
+            for (int page = 0; page < document.getNumberOfPages(); ++page) {
+                BufferedImage bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+                PDPage newPage = new PDPage(new PDRectangle(bim.getWidth(), bim.getHeight()));
+                imageDocument.addPage(newPage);
+                PDImageXObject pdImage = LosslessFactory.createFromImage(imageDocument, bim);
+                PDPageContentStream contentStream = new PDPageContentStream(imageDocument, newPage);
+                contentStream.drawImage(pdImage, 0, 0);
+                contentStream.close();
+            }
+            document.close();
+            document = imageDocument;
+        }
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        document.close();
+        
+        byte[] pdfContent = baos.toByteArray();
+        return WebResponseUtils.bytesToWebResponse(pdfContent,
+                file.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_redacted.pdf");
+    }
+
+    
+    private void redactFoundText(PDDocument document, List<PDFText> blocks, float customPadding) throws IOException {
+        var allPages = document.getDocumentCatalog().getPages();
+
+        for (PDFText block : blocks) {
+            var page = allPages.get(block.getPageIndex());
+            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true, true);
+            contentStream.setNonStrokingColor(Color.BLACK);
+            float padding = (block.getY2() - block.getY1()) * 0.3f + customPadding;
+            PDRectangle pageBox = page.getBBox();
+            contentStream.addRect(block.getX1(), pageBox.getHeight() - block.getY1() - padding, block.getX2() - block.getX1(), block.getY2() - block.getY1() + 2 * padding);
+            contentStream.fill();
+            contentStream.close();
+        }
+    }
+
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
@@ -0,0 +1,176 @@
+package stirling.software.SPDF.controller.api.security;
+import java.io.IOException;
+
+import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
+import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionLaunch;
+import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
+import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+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.Parameter;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+public class SanitizeController {
+
+	@PostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
+	@Operation(summary = "Sanitize a PDF file",
+	        description = "This endpoint processes a PDF file and removes specific elements based on the provided options. Input:PDF Output:PDF Type:SISO")
+	public ResponseEntity<byte[]> sanitizePDF(
+	        @RequestPart(required = true, value = "fileInput")
+	        @Parameter(description = "The input PDF file to be sanitized")
+	                MultipartFile inputFile,
+	        @RequestParam(name = "removeJavaScript", required = false, defaultValue = "false")
+	        @Parameter(description = "Remove JavaScript actions from the PDF if set to true")
+	                Boolean removeJavaScript,
+	        @RequestParam(name = "removeEmbeddedFiles", required = false, defaultValue = "false")
+	        @Parameter(description = "Remove embedded files from the PDF if set to true")
+	                Boolean removeEmbeddedFiles,
+	        @RequestParam(name = "removeMetadata", required = false, defaultValue = "false")
+	        @Parameter(description = "Remove metadata from the PDF if set to true")
+	                Boolean removeMetadata,
+	        @RequestParam(name = "removeLinks", required = false, defaultValue = "false")
+	        @Parameter(description = "Remove links from the PDF if set to true")
+	                Boolean removeLinks,
+	        @RequestParam(name = "removeFonts", required = false, defaultValue = "false")
+	        @Parameter(description = "Remove fonts from the PDF if set to true")
+	                Boolean removeFonts) throws IOException {
+
+	    try (PDDocument document = PDDocument.load(inputFile.getInputStream())) {
+	        if (removeJavaScript) {
+	            sanitizeJavaScript(document);
+	        }
+
+	        if (removeEmbeddedFiles) {
+	            sanitizeEmbeddedFiles(document);
+	        }
+
+	        if (removeMetadata) {
+	            sanitizeMetadata(document);
+	        }
+
+	        if (removeLinks) {
+	            sanitizeLinks(document);
+	        }
+
+	        if (removeFonts) {
+	            sanitizeFonts(document);
+	        }
+
+	        return WebResponseUtils.pdfDocToWebResponse(document, inputFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_sanitized.pdf");
+	    }
+	}
+	private void sanitizeJavaScript(PDDocument document) throws IOException {
+		// Get the root dictionary (catalog) of the PDF
+	    PDDocumentCatalog catalog = document.getDocumentCatalog();
+
+	    // Get the Names dictionary
+	    COSDictionary namesDict = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.NAMES);
+
+	    if (namesDict != null) {
+	        // Get the JavaScript dictionary
+	        COSDictionary javaScriptDict = (COSDictionary) namesDict.getDictionaryObject(COSName.getPDFName("JavaScript"));
+
+	        if (javaScriptDict != null) {
+	            // Remove the JavaScript dictionary
+	            namesDict.removeItem(COSName.getPDFName("JavaScript"));
+	        }
+	    }
+	    
+	    for (PDPage page : document.getPages()) {
+            for (PDAnnotation annotation : page.getAnnotations()) {
+                if (annotation instanceof PDAnnotationWidget) {
+                    PDAnnotationWidget widget = (PDAnnotationWidget) annotation;
+                    PDAction action = widget.getAction();
+                    if (action instanceof PDActionJavaScript) {
+                        widget.setAction(null);
+                    }
+				}
+			}
+	        PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
+	        if (acroForm != null) {
+	            for (PDField field : acroForm.getFields()) {
+	            	PDFormFieldAdditionalActions actions = field.getActions();
+	            	if(actions != null) {
+	            		if (actions.getC() instanceof PDActionJavaScript) {
+	                        actions.setC(null);
+	                    }
+	                    if (actions.getF() instanceof PDActionJavaScript) {
+	                        actions.setF(null);
+	                    }
+	                    if (actions.getK() instanceof PDActionJavaScript) {
+	                        actions.setK(null);
+	                    }
+	                    if (actions.getV() instanceof PDActionJavaScript) {
+	                        actions.setV(null);
+	                    }
+	            	}
+	            }
+	        }
+	    }
+	}
+
+
+
+
+    private void sanitizeEmbeddedFiles(PDDocument document) {
+        PDPageTree allPages = document.getPages();
+
+        for (PDPage page : allPages) {
+            PDResources res = page.getResources();
+
+            // Remove embedded files from the PDF
+            res.getCOSObject().removeItem(COSName.getPDFName("EmbeddedFiles"));
+        }
+    }
+    
+
+    private void sanitizeMetadata(PDDocument document) {
+        PDMetadata metadata = document.getDocumentCatalog().getMetadata();
+        if (metadata != null) {
+            document.getDocumentCatalog().setMetadata(null);
+        }
+    }
+
+
+
+    private void sanitizeLinks(PDDocument document) throws IOException {
+        for (PDPage page : document.getPages()) {
+            for (PDAnnotation annotation : page.getAnnotations()) {
+                if (annotation instanceof PDAnnotationLink) {
+                    PDAction action = ((PDAnnotationLink) annotation).getAction();
+                    if (action instanceof PDActionLaunch || action instanceof PDActionURI) {
+                        ((PDAnnotationLink) annotation).setAction(null);
+                    }
+                }
+            }
+        }
+    }
+
+    private void sanitizeFonts(PDDocument document) {
+        for (PDPage page : document.getPages()) {
+            page.getResources().getCOSObject().removeItem(COSName.getPDFName("Font"));
+        }
+    }
+    
+}
--- a/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java
@@ -1,12 +1,13 @@
 package stirling.software.SPDF.controller.api.security;

 import java.awt.Color;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
+
+import javax.imageio.ImageIO;

 import org.apache.commons.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -15,6 +16,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType0Font;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;
@@ -27,127 +30,167 @@ import org.springframework.web.multipart.MultipartFile;

 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.utils.WebResponseUtils;
-import io.swagger.v3.oas.annotations.media.Schema;
+
@RestController
@Tag(name = "Security", description = "Security APIs")
 public class WatermarkController {

-    @PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
-    @Operation(summary = "Add watermark to a PDF file",
-            description = "This endpoint adds a watermark to a given PDF file. Users can specify the watermark text, font size, rotation, opacity, width spacer, and height spacer. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> addWatermark(
-            @RequestPart(required = true, value = "fileInput")
-            @Parameter(description = "The input PDF file to add a watermark")
-                    MultipartFile pdfFile,
-            @RequestParam(defaultValue = "roman", name = "alphabet")
-            @Parameter(description = "The selected alphabet", 
-                       schema = @Schema(type = "string", 
-                                        allowableValues = {"roman","arabic","japanese","korean","chinese"}, 
-                                        defaultValue = "roman"))
-                    String alphabet,
-            @RequestParam("watermarkText")
-            @Parameter(description = "The watermark text to add to the PDF file")
-                    String watermarkText,
-            @RequestParam(defaultValue = "30", name = "fontSize")
-            @Parameter(description = "The font size of the watermark text", example = "30")
-                    float fontSize,
-            @RequestParam(defaultValue = "0", name = "rotation")
-            @Parameter(description = "The rotation of the watermark text in degrees", example = "0")
-                    float rotation,
-            @RequestParam(defaultValue = "0.5", name = "opacity")
-            @Parameter(description = "The opacity of the watermark text (0.0 - 1.0)", example = "0.5")
-                    float opacity,
-            @RequestParam(defaultValue = "50", name = "widthSpacer")
-            @Parameter(description = "The width spacer between watermark texts", example = "50")
-                    int widthSpacer,
-            @RequestParam(defaultValue = "50", name = "heightSpacer")
-            @Parameter(description = "The height spacer between watermark texts", example = "50")
-                    int heightSpacer) throws IOException, Exception {
+	@PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
+	@Operation(summary = "Add watermark to a PDF file", description = "This endpoint adds a watermark to a given PDF file. Users can specify the watermark type (text or image), rotation, opacity, width spacer, and height spacer. Input:PDF Output:PDF Type:SISO")
+	public ResponseEntity<byte[]> addWatermark(
+			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file to add a watermark") MultipartFile pdfFile,
+			@RequestParam(required = true) @Parameter(description = "The watermark type (text or image)") String watermarkType,
+			@RequestParam(required = false) @Parameter(description = "The watermark text") String watermarkText,
+			@RequestPart(required = false) @Parameter(description = "The watermark image") MultipartFile watermarkImage,
+			
+			@RequestParam(defaultValue = "roman", name = "alphabet") @Parameter(description = "The selected alphabet", 
+            schema = @Schema(type = "string", 
+                             allowableValues = {"roman","arabic","japanese","korean","chinese"}, 
+                             defaultValue = "roman")) String alphabet,
+			@RequestParam(defaultValue = "30", name = "fontSize") @Parameter(description = "The font size of the watermark text", example = "30") float fontSize,
+			@RequestParam(defaultValue = "0", name = "rotation") @Parameter(description = "The rotation of the watermark in degrees", example = "0") float rotation,
+			@RequestParam(defaultValue = "0.5", name = "opacity") @Parameter(description = "The opacity of the watermark (0.0 - 1.0)", example = "0.5") float opacity,
+			@RequestParam(defaultValue = "50", name = "widthSpacer") @Parameter(description = "The width spacer between watermark elements", example = "50") int widthSpacer,
+			@RequestParam(defaultValue = "50", name = "heightSpacer") @Parameter(description = "The height spacer between watermark elements", example = "50") int heightSpacer)
+			throws IOException, Exception {

-        // Load the input PDF
-        PDDocument document = PDDocument.load(pdfFile.getInputStream());
-        String producer = document.getDocumentInformation().getProducer();
-        // Create a page in the document
-        for (PDPage page : document.getPages()) {
+		// Load the input PDF
+		PDDocument document = PDDocument.load(pdfFile.getInputStream());

-            // Get the page's content stream
-            PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true);
+		// Create a page in the document
+		for (PDPage page : document.getPages()) {

-            // Set transparency
-            PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
-            graphicsState.setNonStrokingAlphaConstant(opacity);
-            contentStream.setGraphicsStateParameters(graphicsState);
+			// Get the page's content stream
+			PDPageContentStream contentStream = new PDPageContentStream(document, page,
+					PDPageContentStream.AppendMode.APPEND, true);

+			// Set transparency
+			PDExtendedGraphicsState graphicsState = new PDExtendedGraphicsState();
+			graphicsState.setNonStrokingAlphaConstant(opacity);
+			contentStream.setGraphicsStateParameters(graphicsState);

-			String resourceDir = "";
-		    PDFont font = PDType1Font.HELVETICA_BOLD;
-		    switch (alphabet) {
-		        case "arabic":
-		            resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";
-		            break;
-		        case "japanese":
-		            resourceDir = "static/fonts/Meiryo.ttf";
-		            break;
-		        case "korean":
-		            resourceDir = "static/fonts/malgun.ttf";
-		            break;
-		        case "chinese":
-		            resourceDir = "static/fonts/SimSun.ttf";
-		            break;
-		        case "roman":
-		        default:
-		            resourceDir = "static/fonts/NotoSans-Regular.ttf";
-		            break;
-		    }
+			if (watermarkType.equalsIgnoreCase("text")) {
+				addTextWatermark(contentStream, watermarkText, document, page, rotation, widthSpacer, heightSpacer,
+						fontSize, alphabet);
+			} else if (watermarkType.equalsIgnoreCase("image")) {
+				addImageWatermark(contentStream, watermarkImage, document, page, rotation, widthSpacer, heightSpacer,
+						fontSize);
+			}

+			// Close the content stream
+			contentStream.close();
+		}
+
+		return WebResponseUtils.pdfDocToWebResponse(document,
+				pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_watermarked.pdf");
+	}
+
+	private void addTextWatermark(PDPageContentStream contentStream, String watermarkText, PDDocument document,
+			PDPage page, float rotation, int widthSpacer, int heightSpacer, float fontSize, String alphabet) throws IOException {
+		String resourceDir = "";
+	    PDFont font = PDType1Font.HELVETICA_BOLD;
+	    switch (alphabet) {
+	        case "arabic":
+	            resourceDir = "static/fonts/NotoSansArabic-Regular.ttf";
+	            break;
+	        case "japanese":
+	            resourceDir = "static/fonts/Meiryo.ttf";
+	            break;
+	        case "korean":
+	            resourceDir = "static/fonts/malgun.ttf";
+	            break;
+	        case "chinese":
+	            resourceDir = "static/fonts/SimSun.ttf";
+	            break;
+	        case "roman":
+	        default:
+	            resourceDir = "static/fonts/NotoSans-Regular.ttf";
+	            break;
+	    }
+
+        
+        if(!resourceDir.equals("")) {
+            ClassPathResource classPathResource = new ClassPathResource(resourceDir);
+            String fileExtension = resourceDir.substring(resourceDir.lastIndexOf("."));
+            File tempFile = File.createTempFile("NotoSansFont", fileExtension);
+            try (InputStream is = classPathResource.getInputStream(); FileOutputStream os = new FileOutputStream(tempFile)) {
+                IOUtils.copy(is, os);
+            }
            
-            if(!resourceDir.equals("")) {
-	            ClassPathResource classPathResource = new ClassPathResource(resourceDir);
-	            String fileExtension = resourceDir.substring(resourceDir.lastIndexOf("."));
-	            File tempFile = File.createTempFile("NotoSansFont", fileExtension);
-	            try (InputStream is = classPathResource.getInputStream(); FileOutputStream os = new FileOutputStream(tempFile)) {
-	                IOUtils.copy(is, os);
-	            }
-	            
-	            font = PDType0Font.load(document, tempFile);
-	            tempFile.deleteOnExit();
-            }
-            contentStream.beginText();
-            contentStream.setFont(font, fontSize);
-            contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
-
-            // Set size and location of watermark
-            float pageWidth = page.getMediaBox().getWidth();
-            float pageHeight = page.getMediaBox().getHeight();
-            float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
-            float watermarkHeight = heightSpacer + fontSize;
-            int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
-            int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
-
-            // Add the watermark text
-            for (int i = 0; i < watermarkRows; i++) {
-                for (int j = 0; j < watermarkCols; j++) {
-                	
-                	if(producer.contains("Google Docs")) {
-                		//This fixes weird unknown google docs y axis rotation/flip issue 
-                		//TODO: Long term fix one day
-                        //contentStream.setTextMatrix(1, 0, 0, -1, j * watermarkWidth, pageHeight - i * watermarkHeight);
-                		Matrix matrix = new Matrix(1, 0, 0, -1, j * watermarkWidth, pageHeight - i * watermarkHeight);
-                		contentStream.setTextMatrix(matrix);
-                	} else {
-                		contentStream.setTextMatrix(Matrix.getRotateInstance((float) Math.toRadians(rotation), j * watermarkWidth, i * watermarkHeight));
-                	}
-                    contentStream.showTextWithPositioning(new Object[] { watermarkText });
-                }
-            }
-            contentStream.endText();
-
-            // Close the content stream
-            contentStream.close();
+            font = PDType0Font.load(document, tempFile);
+            tempFile.deleteOnExit();
        }
-        return WebResponseUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_watermarked.pdf");
-    }
+        
+		contentStream.setFont(font, fontSize);
+		contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
+
+		// Set size and location of text watermark
+		float watermarkWidth = widthSpacer + font.getStringWidth(watermarkText) * fontSize / 1000;
+		float watermarkHeight = heightSpacer + fontSize;
+		float pageWidth = page.getMediaBox().getWidth();
+		float pageHeight = page.getMediaBox().getHeight();
+		int watermarkRows = (int) (pageHeight / watermarkHeight + 1);
+		int watermarkCols = (int) (pageWidth / watermarkWidth + 1);
+
+		// Add the text watermark
+		for (int i = 0; i < watermarkRows; i++) {
+			for (int j = 0; j < watermarkCols; j++) {
+				contentStream.beginText();
+				contentStream.setTextMatrix(Matrix.getRotateInstance((float) Math.toRadians(rotation),
+						j * watermarkWidth, i * watermarkHeight));
+				contentStream.showText(watermarkText);
+				contentStream.endText();
+			}
+		}
+	}
+
+	private void addImageWatermark(PDPageContentStream contentStream, MultipartFile watermarkImage, PDDocument document, PDPage page, float rotation,
+            int widthSpacer, int heightSpacer, float fontSize) throws IOException {
+
+// Load the watermark image
+BufferedImage image = ImageIO.read(watermarkImage.getInputStream());
+
+// Compute width based on original aspect ratio
+float aspectRatio = (float) image.getWidth() / (float) image.getHeight();
+
+// Desired physical height (in PDF points)
+float desiredPhysicalHeight = fontSize ;
+
+// Desired physical width based on the aspect ratio
+float desiredPhysicalWidth = desiredPhysicalHeight * aspectRatio;
+
+// Convert the BufferedImage to PDImageXObject
+PDImageXObject xobject = LosslessFactory.createFromImage(document, image);
+
+// Calculate the number of rows and columns for watermarks
+float pageWidth = page.getMediaBox().getWidth();
+float pageHeight = page.getMediaBox().getHeight();
+int watermarkRows = (int) ((pageHeight + heightSpacer) / (desiredPhysicalHeight + heightSpacer));
+int watermarkCols = (int) ((pageWidth + widthSpacer) / (desiredPhysicalWidth + widthSpacer));
+
+for (int i = 0; i < watermarkRows; i++) {
+for (int j = 0; j < watermarkCols; j++) {
+float x = j * (desiredPhysicalWidth + widthSpacer);
+float y = i * (desiredPhysicalHeight + heightSpacer);
+
+// Save the graphics state
+contentStream.saveGraphicsState();
+
+// Create rotation matrix and rotate
+contentStream.transform(Matrix.getTranslateInstance(x + desiredPhysicalWidth / 2, y + desiredPhysicalHeight / 2));
+contentStream.transform(Matrix.getRotateInstance(Math.toRadians(rotation), 0, 0));
+contentStream.transform(Matrix.getTranslateInstance(-desiredPhysicalWidth / 2, -desiredPhysicalHeight / 2));
+
+// Draw the image and restore the graphics state
+contentStream.drawImage(xobject, 0, 0, desiredPhysicalWidth, desiredPhysicalHeight);
+contentStream.restoreGraphicsState();
+}
+
+}
+
+	}

 }
--- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
@@ -0,0 +1,121 @@
+package stirling.software.SPDF.controller.web;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.io.support.ResourcePatternUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
+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.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.repository.UserRepository;
+@Controller
+@Tag(name = "Account Security", description = "Account Security APIs")
+public class AccountWebController {
+	
+
+	@GetMapping("/login")
+	public String login(HttpServletRequest request, Model model, Authentication authentication) {
+		if (authentication != null && authentication.isAuthenticated()) {
+            return "redirect:/";
+        }
+		
+		if (request.getParameter("error") != null) {
+
+	        model.addAttribute("error", request.getParameter("error"));
+	    }
+	    if (request.getParameter("logout") != null) {
+
+	        model.addAttribute("logoutMessage", "You have been logged out.");
+	    }
+	    
+	    return "login";
+	}
+	@Autowired
+	private UserRepository userRepository;  // Assuming you have a repository for user operations
+
+	@Autowired
+	private UserService userService;  // Assuming you have a repository for user operations
+
+	@PreAuthorize("hasRole('ROLE_ADMIN')")
+	@GetMapping("/addUsers")
+	public String showAddUserForm(Model model) {
+	    List<User> allUsers = userRepository.findAll();
+	    model.addAttribute("users", allUsers);
+	    return "addUsers";
+	}
+
+	
+	
+	@GetMapping("/account")
+	public String account(HttpServletRequest request, Model model, Authentication authentication) {
+		if (authentication == null || !authentication.isAuthenticated()) {
+            return "redirect:/";
+        }
+		if (authentication != null && authentication.isAuthenticated()) {
+	        Object principal = authentication.getPrincipal();
+
+	        if (principal instanceof UserDetails) {
+	            // Cast the principal object to UserDetails
+	            UserDetails userDetails = (UserDetails) principal;
+
+	            // Retrieve username and other attributes
+	            String username = userDetails.getUsername();
+
+	            // Fetch user details from the database
+	            Optional<User> user = userRepository.findByUsername(username);  // Assuming findByUsername method exists
+	            if (!user.isPresent()) {
+	                // Handle error appropriately
+	                return "redirect:/error";  // Example redirection in case of error
+	            }
+
+	            // Convert settings map to JSON string
+	            ObjectMapper objectMapper = new ObjectMapper();
+	            String settingsJson;
+	            try {
+	                settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
+	            } catch (JsonProcessingException e) {
+	                // Handle JSON conversion error
+	                e.printStackTrace();
+	                return "redirect:/error";  // Example redirection in case of error
+	            }
+
+	            // Add attributes to the model
+	            model.addAttribute("username", username);
+	            model.addAttribute("role", user.get().getRolesAsString());
+	            model.addAttribute("settings", settingsJson);
+	        }
+		} else {
+	        	return "redirect:/";
+	        }
+	    return "account";
+	}
+	 
+	
+	
+	
+}
--- a/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java
@@ -1,88 +1,109 @@
-package stirling.software.SPDF.controller.web;
-
-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;
-
-@Controller
-@Tag(name = "Convert", description = "Convert APIs")
-public class ConverterWebController {
-
-    @GetMapping("/img-to-pdf")
-    @Hidden
-    public String convertImgToPdfForm(Model model) {
-        model.addAttribute("currentPage", "img-to-pdf");
-        return "convert/img-to-pdf";
-    }
-
-
-    @GetMapping("/pdf-to-img")
-    @Hidden
-    public String pdfToimgForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-img");
-        return "convert/pdf-to-img";
-    }
-    
-    @GetMapping("/file-to-pdf")
-    @Hidden
-    public String convertToPdfForm(Model model) {
-        model.addAttribute("currentPage", "file-to-pdf");
-        return "convert/file-to-pdf";
-    }
-    
-
-    
-    //PDF TO......
-    
-    @GetMapping("/pdf-to-html")
-    @Hidden
-    public ModelAndView pdfToHTML() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-html");
-        modelAndView.addObject("currentPage", "pdf-to-html");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-presentation")
-    @Hidden
-    public ModelAndView pdfToPresentation() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-presentation");
-        modelAndView.addObject("currentPage", "pdf-to-presentation");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-text")
-    @Hidden
-    public ModelAndView pdfToText() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-text");
-        modelAndView.addObject("currentPage", "pdf-to-text");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-word")
-    @Hidden
-    public ModelAndView pdfToWord() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-word");
-        modelAndView.addObject("currentPage", "pdf-to-word");
-        return modelAndView;
-    }
-
-    @GetMapping("/pdf-to-xml")
-    @Hidden
-    public ModelAndView pdfToXML() {
-        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-xml");
-        modelAndView.addObject("currentPage", "pdf-to-xml");
-        return modelAndView;
-    }
-
-
-    @GetMapping("/pdf-to-pdfa")
-    @Hidden
-    public String pdfToPdfAForm(Model model) {
-        model.addAttribute("currentPage", "pdf-to-pdfa");
-        return "convert/pdf-to-pdfa";
-    }
-}
+package stirling.software.SPDF.controller.web;
+
+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;
+
+@Controller
+@Tag(name = "Convert", description = "Convert APIs")
+public class ConverterWebController {
+
+    @GetMapping("/img-to-pdf")
+    @Hidden
+    public String convertImgToPdfForm(Model model) {
+        model.addAttribute("currentPage", "img-to-pdf");
+        return "convert/img-to-pdf";
+    }
+
+    @GetMapping("/html-to-pdf")
+    @Hidden
+    public String convertHTMLToPdfForm(Model model) {
+        model.addAttribute("currentPage", "html-to-pdf");
+        return "convert/html-to-pdf";
+    }
+    @GetMapping("/markdown-to-pdf")
+    @Hidden
+    public String convertMarkdownToPdfForm(Model model) {
+        model.addAttribute("currentPage", "markdown-to-pdf");
+        return "convert/markdown-to-pdf";
+    }
+    
+    
+    @GetMapping("/url-to-pdf")
+    @Hidden
+    public String convertURLToPdfForm(Model model) {
+        model.addAttribute("currentPage", "url-to-pdf");
+        return "convert/url-to-pdf";
+    }
+
+    
+    @GetMapping("/pdf-to-img")
+    @Hidden
+    public String pdfToimgForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-img");
+        return "convert/pdf-to-img";
+    }
+    
+    @GetMapping("/file-to-pdf")
+    @Hidden
+    public String convertToPdfForm(Model model) {
+        model.addAttribute("currentPage", "file-to-pdf");
+        return "convert/file-to-pdf";
+    }
+    
+
+    
+    //PDF TO......
+    
+    @GetMapping("/pdf-to-html")
+    @Hidden
+    public ModelAndView pdfToHTML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-html");
+        modelAndView.addObject("currentPage", "pdf-to-html");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-presentation")
+    @Hidden
+    public ModelAndView pdfToPresentation() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-presentation");
+        modelAndView.addObject("currentPage", "pdf-to-presentation");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-text")
+    @Hidden
+    public ModelAndView pdfToText() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-text");
+        modelAndView.addObject("currentPage", "pdf-to-text");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-word")
+    @Hidden
+    public ModelAndView pdfToWord() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-word");
+        modelAndView.addObject("currentPage", "pdf-to-word");
+        return modelAndView;
+    }
+
+    @GetMapping("/pdf-to-xml")
+    @Hidden
+    public ModelAndView pdfToXML() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-xml");
+        modelAndView.addObject("currentPage", "pdf-to-xml");
+        return modelAndView;
+    }
+
+
+    @GetMapping("/pdf-to-pdfa")
+    @Hidden
+    public String pdfToPdfAForm(Model model) {
+        model.addAttribute("currentPage", "pdf-to-pdfa");
+        return "convert/pdf-to-pdfa";
+    }
+}
--- a/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java
@@ -1,21 +1,75 @@
 package stirling.software.SPDF.controller.web;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;

@Controller
@Tag(name = "General", description = "General APIs")
 public class GeneralWebController {
-	 @GetMapping("/pipeline")
-	    @Hidden
-	    public String pipelineForm(Model model) {
-	        model.addAttribute("currentPage", "pipeline");
-	        return "pipeline";
+	
+
+	
+	
+	@GetMapping("/pipeline")
+	@Hidden
+	public String pipelineForm(Model model) {
+	    model.addAttribute("currentPage", "pipeline");
+
+	    List<String> pipelineConfigs = new ArrayList<>();
+	    try (Stream<Path> paths = Files.walk(Paths.get("./pipeline/defaultWebUIConfigs/"))) {
+	        List<Path> jsonFiles = paths
+	            .filter(Files::isRegularFile)
+	            .filter(p -> p.toString().endsWith(".json"))
+	            .collect(Collectors.toList());
+
+	        for (Path jsonFile : jsonFiles) {
+	            String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
+	            pipelineConfigs.add(content);
+	        }
+	        List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
+	        for (String config : pipelineConfigs) {
+	            Map<String, Object> jsonContent = new ObjectMapper().readValue(config, Map.class);
+	            String name = (String) jsonContent.get("name");
+	            Map<String, String> configWithName = new HashMap<>();
+	            configWithName.put("json", config);
+	            configWithName.put("name", name);
+	            pipelineConfigsWithNames.add(configWithName);
+	        }
+	        model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
+
+	    } catch (IOException e) {
+	        e.printStackTrace();
 	    }
+
+	    model.addAttribute("pipelineConfigs", pipelineConfigs);
+
+	    return "pipeline";
+	}
+
+	 
+	 
 	 
    @GetMapping("/merge-pdfs")
    @Hidden
@@ -47,6 +101,20 @@ public class GeneralWebController {
        return "pdf-organizer";
    }
    
+    @GetMapping("/extract-page")
+    @Hidden
+    public String extractPages(Model model) {
+        model.addAttribute("currentPage", "extract-page");
+        return "extract-page";
+    }
+    
+    @GetMapping("/pdf-to-single-page")
+    @Hidden
+    public String pdfToSinglePage(Model model) {
+        model.addAttribute("currentPage", "pdf-to-single-page");
+        return "pdf-to-single-page";
+    }
+    
    @GetMapping("/rotate-pdf")
    @Hidden
    public String rotatePdfForm(Model model) {
@@ -65,7 +133,47 @@ public class GeneralWebController {
    @Hidden
    public String signForm(Model model) {
        model.addAttribute("currentPage", "sign");
+        model.addAttribute("fonts", getFontNames());
        return "sign";
    }
+    
+    @Autowired
+    private ResourceLoader resourceLoader;
+    
+    private List<String> getFontNames() {
+        try {
+            Resource[] resources = ResourcePatternUtils.getResourcePatternResolver(resourceLoader)
+                    .getResources("classpath:static/fonts/*.woff2");
+            
+            return Arrays.stream(resources)
+                    .map(resource -> {
+                        try {
+                            String filename = resource.getFilename();
+                            return filename.substring(0, filename.length() - 6); // Remove .woff2 extension
+                        } catch (Exception e) {
+                            throw new RuntimeException("Error processing filename", e);
+                        }
+                    })
+                    .collect(Collectors.toList());
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to read font directory", e);
+        }
+    }

+    
+
+    @GetMapping("/crop")
+    @Hidden
+    public String cropForm(Model model) {
+        model.addAttribute("currentPage", "crop");
+        return "crop";
+    }
+    
+
+    @GetMapping("/auto-split-pdf")
+    @Hidden
+    public String autoSPlitPDFForm(Model model) {
+        model.addAttribute("currentPage", "auto-split-pdf");
+        return "auto-split-pdf";
+    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.web;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -7,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;

 import io.swagger.v3.oas.annotations.Hidden;
+import stirling.software.SPDF.model.ApplicationProperties;

@Controller
 public class HomeWebController {
@@ -31,18 +33,16 @@ public class HomeWebController {
        return "redirect:/";
    }
    
-   
+    @Autowired
+	ApplicationProperties applicationProperties;
+

    @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)
    @ResponseBody
    @Hidden
    public String getRobotsTxt() {
-        String allowGoogleVisibility = System.getProperty("ALLOW_GOOGLE_VISIBILITY");
-        if (allowGoogleVisibility == null)
-            allowGoogleVisibility = System.getenv("ALLOW_GOOGLE_VISIBILITY");
-        if (allowGoogleVisibility == null)
-            allowGoogleVisibility = "false";
-        if (Boolean.parseBoolean(allowGoogleVisibility)) {
+        Boolean allowGoogle = applicationProperties.getSystem().getGooglevisibility();
+    	if(Boolean.TRUE.equals(allowGoogle)) {
            return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /";
        } else {
            return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /";
--- a/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java
@@ -1,8 +1,16 @@
 package stirling.software.SPDF.controller.web;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;

+import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -14,14 +22,32 @@ 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 stirling.software.SPDF.config.StartupApplicationListener;
+import stirling.software.SPDF.model.ApplicationProperties;

@RestController
@RequestMapping("/api/v1")
@Tag(name = "API", description = "Info APIs")
 public class MetricsController {

+	
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+   
    private final MeterRegistry meterRegistry;

+    private boolean metricsEnabled;
+    
+    @PostConstruct
+    public void init() {
+    	Boolean metricsEnabled = applicationProperties.getMetrics().getEnabled();
+    	if(metricsEnabled == null)
+    		metricsEnabled = true;
+        this.metricsEnabled = metricsEnabled;
+    }
+    
    public MetricsController(MeterRegistry meterRegistry) {
        this.meterRegistry = meterRegistry;
    }
@@ -29,18 +55,25 @@ public class MetricsController {
    @GetMapping("/status")
    @Operation(summary = "Application status and version",
            description = "This endpoint returns the status of the application and its version number.")
-    public Map<String, String> getStatus() {
+    public ResponseEntity<?> getStatus() {
+        if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+
        Map<String, String> status = new HashMap<>();
        status.put("status", "UP");
        status.put("version", getClass().getPackage().getImplementationVersion());
-        return status;
+        return ResponseEntity.ok(status);
    }
    
    @GetMapping("/loads")
    @Operation(summary = "GET request count",
            description = "This endpoint returns the total count of GET requests or the count of GET requests for a specific endpoint.")
-    public Double getPageLoads(@RequestParam(required = false,  name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
-        try {
+    public ResponseEntity<?> getPageLoads(@RequestParam(required = false,  name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
+    	if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+    	try {

            double count = 0.0;
            
@@ -68,36 +101,165 @@ public class MetricsController {
                }
            }

-            return count;
+            return ResponseEntity.ok(count);
        } catch (Exception e) {
-            return -1.0;
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
        }
    }

+    @GetMapping("/loads/all")
+    @Operation(summary = "GET requests count for all endpoints",
+            description = "This endpoint returns the count of GET requests for each endpoint.")
+    public ResponseEntity<?> getAllEndpointLoads() {
+    	if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+        try {
+            Map<String, Double> counts = new HashMap<>();
+
+            for (Meter meter : meterRegistry.getMeters()) {
+                if (meter.getId().getName().equals("http.requests")) {
+                    String method = meter.getId().getTag("method");
+                    if (method != null && method.equals("GET")) {
+                        String uri = meter.getId().getTag("uri");
+                        if (uri != null) {
+                            double currentCount = counts.getOrDefault(uri, 0.0);
+                            if (meter instanceof Counter) {
+                                currentCount += ((Counter) meter).count();
+                            }
+                            counts.put(uri, currentCount);
+                        }
+                    }
+                }
+            }
+
+            List<EndpointCount> results = counts.entrySet().stream()
+                .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
+                .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                .collect(Collectors.toList());
+
+            return ResponseEntity.ok(results);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    public class EndpointCount {
+        private String endpoint;
+        private double count;
+        
+        public EndpointCount(String endpoint, double count) {
+        	this.endpoint = endpoint;
+        	this.count = count;
+        }
+		public String getEndpoint() {
+			return endpoint;
+		}
+		public void setEndpoint(String endpoint) {
+			this.endpoint = endpoint;
+		}
+		public double getCount() {
+			return count;
+		}
+		public void setCount(double count) {
+			this.count = count;
+		}
+
+    }
+
+
    @GetMapping("/requests")
    @Operation(summary = "POST request count",
            description = "This endpoint returns the total count of POST requests or the count of POST requests for a specific endpoint.")
-    public Double getTotalRequests(@RequestParam(required = false,  name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
-        try {
-            Counter counter;
-            if (endpoint.isPresent() && !endpoint.get().isBlank()) {
-            	if(!endpoint.get().startsWith("/")) {
-        			endpoint =  Optional.of("/" + endpoint.get());
-        		}
-            	
-            	System.out.println("loads " + endpoint.get() +  " vs " + meterRegistry.get("http.requests").tags("uri", endpoint.get()).toString());
-                counter = meterRegistry.get("http.requests")
-                    .tags("method", "POST", "uri", endpoint.get()).counter();
-            } else {
-                counter = meterRegistry.get("http.requests")
-                    .tags("method", "POST").counter();
-            }
-            return counter.count();
-        } catch (Exception e) {
-        	e.printStackTrace();
-            return 0.0;
+    public ResponseEntity<?> getTotalRequests(@RequestParam(required = false, name = "endpoint") @Parameter(description = "endpoint") Optional<String> endpoint) {
+    	if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+    	try {
+            double count = 0.0;
+
+            for (Meter meter : meterRegistry.getMeters()) {
+                if (meter.getId().getName().equals("http.requests")) {
+                    String method = meter.getId().getTag("method");
+                    if (method != null && method.equals("POST")) {
+                        if (endpoint.isPresent() && !endpoint.get().isBlank()) {
+                            if (!endpoint.get().startsWith("/")) {
+                                endpoint = Optional.of("/" + endpoint.get());
+                            }
+                            if (endpoint.get().equals(meter.getId().getTag("uri"))) {
+                                if (meter instanceof Counter) {
+                                    count += ((Counter) meter).count();
+                                }
+                            }
+                        } else {
+                            if (meter instanceof Counter) {
+                                count += ((Counter) meter).count();
+                            }
+                        }
+                    }
+                }
+            }
+            return ResponseEntity.ok(count);	
+        } catch (Exception e) {
+        	return ResponseEntity.ok(-1);
        }
-        
    }

+
+    @GetMapping("/requests/all")
+    @Operation(summary = "POST requests count for all endpoints",
+            description = "This endpoint returns the count of POST requests for each endpoint.")
+    public ResponseEntity<?> getAllPostRequests() {
+    	if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+        try {
+            Map<String, Double> counts = new HashMap<>();
+
+            for (Meter meter : meterRegistry.getMeters()) {
+                if (meter.getId().getName().equals("http.requests")) {
+                    String method = meter.getId().getTag("method");
+                    if (method != null && method.equals("POST")) {
+                        String uri = meter.getId().getTag("uri");
+                        if (uri != null) {
+                            double currentCount = counts.getOrDefault(uri, 0.0);
+                            if (meter instanceof Counter) {
+                                currentCount += ((Counter) meter).count();
+                            }
+                            counts.put(uri, currentCount);
+                        }
+                    }
+                }
+            }
+
+            List<EndpointCount> results = counts.entrySet().stream()
+                .map(entry -> new EndpointCount(entry.getKey(), entry.getValue()))
+                .sorted(Comparator.comparing(EndpointCount::getCount).reversed())
+                .collect(Collectors.toList());
+
+            return ResponseEntity.ok(results);
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    
+    @GetMapping("/uptime")
+    public ResponseEntity<?> getUptime() {
+        if (!metricsEnabled) {
+            return ResponseEntity.status(HttpStatus.FORBIDDEN).body("This endpoint is disabled.");
+        }
+
+        LocalDateTime now = LocalDateTime.now();
+        Duration uptime = Duration.between(StartupApplicationListener.startTime, now);
+        return ResponseEntity.ok(formatDuration(uptime));
+    }
+
+    private String formatDuration(Duration duration) {
+        long days = duration.toDays();
+        long hours = duration.toHoursPart();
+        long minutes = duration.toMinutesPart();
+        long seconds = duration.toSecondsPart();
+        return String.format("%dd %dh %dm %ds", days, hours, minutes, seconds);
+    }
 }
--- a/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java
@@ -31,7 +31,22 @@ public class OtherWebController {
        modelAndView.addObject("currentPage", "extract-image-scans");
        return modelAndView;
    }
-
+    
+    @GetMapping("/show-javascript")
+    @Hidden
+    public String extractJavascriptForm(Model model) {
+        model.addAttribute("currentPage", "show-javascript");
+        return "other/show-javascript";
+    }
+    
+    
+    @GetMapping("/add-page-numbers")
+    @Hidden
+    public String addPageNumbersForm(Model model) {
+        model.addAttribute("currentPage", "add-page-numbers");
+        return "other/add-page-numbers";
+    }
+    
    @GetMapping("/extract-images")
    @Hidden
    public String extractImagesForm(Model model) {
@@ -133,4 +148,13 @@ public class OtherWebController {
        return "other/auto-crop";
    }
    
+    @GetMapping("/auto-rename")
+    @Hidden
+    public String autoRenameForm(Model model) {
+        model.addAttribute("currentPage", "auto-rename");
+        return "other/auto-rename";
+    }
+    
+
+    
 }
--- a/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
+++ b/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java
@@ -1,46 +1,68 @@
-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;
-
-@Controller
-@Tag(name = "Security", description = "Security APIs")
-public class SecurityWebController {
-    @GetMapping("/add-password")
-    @Hidden
-    public String addPasswordForm(Model model) {
-        model.addAttribute("currentPage", "add-password");
-        return "security/add-password";
-    }
-    @GetMapping("/change-permissions")
-    @Hidden
-    public String permissionsForm(Model model) {
-        model.addAttribute("currentPage", "change-permissions");
-        return "security/change-permissions";
-    }
-
-    @GetMapping("/remove-password")
-    @Hidden
-    public String removePasswordForm(Model model) {
-        model.addAttribute("currentPage", "remove-password");
-        return "security/remove-password";
-    }
-
-    @GetMapping("/add-watermark")
-    @Hidden
-    public String addWatermarkForm(Model model) {
-        model.addAttribute("currentPage", "add-watermark");
-        return "security/add-watermark";
-    }
-    
-    @GetMapping("/cert-sign")
-    @Hidden
-    public String certSignForm(Model model) {
-        model.addAttribute("currentPage", "cert-sign");
-        return "security/cert-sign";
-    }
-}
+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;
+
+@Controller
+@Tag(name = "Security", description = "Security APIs")
+public class SecurityWebController {
+	
+	@GetMapping("/auto-redact")
+    @Hidden
+    public String autoRedactForm(Model model) {
+        model.addAttribute("currentPage", "auto-redact");
+        return "security/auto-redact";
+    }
+	
+    @GetMapping("/add-password")
+    @Hidden
+    public String addPasswordForm(Model model) {
+        model.addAttribute("currentPage", "add-password");
+        return "security/add-password";
+    }
+    @GetMapping("/change-permissions")
+    @Hidden
+    public String permissionsForm(Model model) {
+        model.addAttribute("currentPage", "change-permissions");
+        return "security/change-permissions";
+    }
+
+    @GetMapping("/remove-password")
+    @Hidden
+    public String removePasswordForm(Model model) {
+        model.addAttribute("currentPage", "remove-password");
+        return "security/remove-password";
+    }
+
+    @GetMapping("/add-watermark")
+    @Hidden
+    public String addWatermarkForm(Model model) {
+        model.addAttribute("currentPage", "add-watermark");
+        return "security/add-watermark";
+    }
+    
+    @GetMapping("/cert-sign")
+    @Hidden
+    public String certSignForm(Model model) {
+        model.addAttribute("currentPage", "cert-sign");
+        return "security/cert-sign";
+    }
+    
+    @GetMapping("/sanitize-pdf")
+    @Hidden
+    public String sanitizeForm(Model model) {
+        model.addAttribute("currentPage", "sanitize-pdf");
+        return "security/sanitize-pdf";
+    }
+    
+    @GetMapping("/get-info-on-pdf")
+    @Hidden
+    public String getInfo(Model model) {
+        model.addAttribute("currentPage", "get-info-on-pdf");
+        return "security/get-info-on-pdf";
+    }
+}
--- a/src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java
+++ b/src/main/java/stirling/software/SPDF/model/ApiKeyAuthenticationToken.java
@@ -0,0 +1,49 @@
+package stirling.software.SPDF.model;
+import java.util.Collection;
+
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.springframework.security.core.GrantedAuthority;
+
+public class ApiKeyAuthenticationToken extends AbstractAuthenticationToken {
+
+    private final Object principal;
+    private Object credentials;
+
+    public ApiKeyAuthenticationToken(String apiKey) {
+        super(null);
+        this.principal = null;
+        this.credentials = apiKey;
+        setAuthenticated(false);
+    }
+
+    public ApiKeyAuthenticationToken(Object principal, String apiKey, Collection<? extends GrantedAuthority> authorities) {
+        super(authorities);
+        this.principal = principal;  // principal can be a UserDetails object
+        this.credentials = apiKey;
+        super.setAuthenticated(true); // this authentication is trusted
+    }
+
+    @Override
+    public Object getCredentials() {
+        return credentials;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return principal;
+    }
+
+    @Override
+    public void setAuthenticated(boolean isAuthenticated) throws IllegalArgumentException {
+        if (isAuthenticated) {
+            throw new IllegalArgumentException("Cannot set this token to trusted. Use constructor which takes a GrantedAuthority list instead.");
+        }
+        super.setAuthenticated(false);
+    }
+
+    @Override
+    public void eraseCredentials() {
+        super.eraseCredentials();
+        credentials = null;
+    }
+}
--- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
+++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java
@@ -0,0 +1,330 @@
+package stirling.software.SPDF.model;
+
+import java.util.List;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+import stirling.software.SPDF.config.YamlPropertySourceFactory;
+
+@Configuration
+@ConfigurationProperties(prefix = "")
+@PropertySource(value = "file:./configs/settings.yml", factory = YamlPropertySourceFactory.class)
+public class ApplicationProperties {
+	private Security security;
+	private System system;
+	private Ui ui;
+	private Endpoints endpoints;
+	private Metrics metrics;
+	private AutomaticallyGenerated automaticallyGenerated;
+	private AutoPipeline autoPipeline;
+
+	public AutoPipeline getAutoPipeline() {
+		return autoPipeline != null ? autoPipeline : new AutoPipeline();
+	}
+
+	public void setAutoPipeline(AutoPipeline autoPipeline) {
+		this.autoPipeline = autoPipeline;
+	}
+
+	public Security getSecurity() {
+		return security != null ? security : new Security();
+	}
+
+	public void setSecurity(Security security) {
+		this.security = security;
+	}
+
+	public System getSystem() {
+		return system != null ? system : new System();
+	}
+
+	public void setSystem(System system) {
+		this.system = system;
+	}
+
+	public Ui getUi() {
+		return ui != null ? ui : new Ui();
+	}
+
+	public void setUi(Ui ui) {
+		this.ui = ui;
+	}
+
+	public Endpoints getEndpoints() {
+		return endpoints != null ? endpoints : new Endpoints();
+	}
+
+	public void setEndpoints(Endpoints endpoints) {
+		this.endpoints = endpoints;
+	}
+
+	public Metrics getMetrics() {
+		return metrics != null ? metrics : new Metrics();
+	}
+
+	public void setMetrics(Metrics metrics) {
+		this.metrics = metrics;
+	}
+
+	public AutomaticallyGenerated getAutomaticallyGenerated() {
+		return automaticallyGenerated != null ? automaticallyGenerated : new AutomaticallyGenerated();
+	}
+
+	public void setAutomaticallyGenerated(AutomaticallyGenerated automaticallyGenerated) {
+		this.automaticallyGenerated = automaticallyGenerated;
+	}
+
+	@Override
+	public String toString() {
+		return "ApplicationProperties [security=" + security + ", system=" + system + ", ui=" + ui + ", endpoints="
+				+ endpoints + ", metrics=" + metrics + ", automaticallyGenerated=" + automaticallyGenerated
+				+ ", autoPipeline=" + autoPipeline + "]";
+	}
+
+	public static class AutoPipeline {
+		private String outputFolder;
+
+		public String getOutputFolder() {
+			return outputFolder;
+		}
+
+		public void setOutputFolder(String outputFolder) {
+			this.outputFolder = outputFolder;
+		}
+
+		@Override
+		public String toString() {
+			return "AutoPipeline [outputFolder=" + outputFolder + "]";
+		}
+		
+		
+		
+	}
+	public static class Security {
+		private Boolean enableLogin;
+		private InitialLogin initialLogin;
+		private Boolean csrfDisabled;
+
+		public Boolean getEnableLogin() {
+			return enableLogin;
+		}
+
+		public void setEnableLogin(Boolean enableLogin) {
+			this.enableLogin = enableLogin;
+		}
+
+		public InitialLogin getInitialLogin() {
+			return initialLogin != null ? initialLogin : new InitialLogin();
+		}
+
+		public void setInitialLogin(InitialLogin initialLogin) {
+			this.initialLogin = initialLogin;
+		}
+
+		public Boolean getCsrfDisabled() {
+			return csrfDisabled;
+		}
+
+		public void setCsrfDisabled(Boolean csrfDisabled) {
+			this.csrfDisabled = csrfDisabled;
+		}
+
+		
+		@Override
+		public String toString() {
+			return "Security [enableLogin=" + enableLogin + ", initialLogin=" + initialLogin + ", csrfDisabled="
+					+ csrfDisabled + "]";
+		}
+
+
+		public static class InitialLogin {
+
+			private String username;
+			private String password;
+			
+			public String getUsername() {
+				return username;
+			}
+
+			public void setUsername(String username) {
+				this.username = username;
+			}
+
+			public String getPassword() {
+				return password;
+			}
+
+			public void setPassword(String password) {
+				this.password = password;
+			}
+
+			@Override
+			public String toString() {
+				return "InitialLogin [username=" + username + ", password=" + (password != null && !password.isEmpty() ? "MASKED" : "NULL") + "]";
+			}
+
+
+			
+		}
+	}
+
+	public static class System {
+		private String defaultLocale;
+		private Boolean googlevisibility;
+		private String rootURIPath;
+		private String customStaticFilePath;
+		private Integer maxFileSize;
+
+		public String getDefaultLocale() {
+			return defaultLocale;
+		}
+
+		public void setDefaultLocale(String defaultLocale) {
+			this.defaultLocale = defaultLocale;
+		}
+
+		public Boolean getGooglevisibility() {
+			return googlevisibility;
+		}
+
+		public void setGooglevisibility(Boolean googlevisibility) {
+			this.googlevisibility = googlevisibility;
+		}
+
+		public String getRootURIPath() {
+			return rootURIPath;
+		}
+
+		public void setRootURIPath(String rootURIPath) {
+			this.rootURIPath = rootURIPath;
+		}
+
+		public String getCustomStaticFilePath() {
+			return customStaticFilePath;
+		}
+
+		public void setCustomStaticFilePath(String customStaticFilePath) {
+			this.customStaticFilePath = customStaticFilePath;
+		}
+
+		public Integer getMaxFileSize() {
+			return maxFileSize;
+		}
+
+		public void setMaxFileSize(Integer maxFileSize) {
+			this.maxFileSize = maxFileSize;
+		}
+
+		@Override
+		public String toString() {
+			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility + ", rootURIPath="
+					+ rootURIPath + ", customStaticFilePath=" + customStaticFilePath + ", maxFileSize=" + maxFileSize
+					+ "]";
+		}
+
+		
+	}
+
+	public static class Ui {
+	    private String appName;
+	    private String homeDescription;
+	    private String appNameNavbar;
+
+	    public String getAppName() {
+	        return appName;
+	    }
+
+	    public void setAppName(String appName) {
+	        this.appName = appName;
+	    }
+
+	    public String getHomeDescription() {
+	        return homeDescription;
+	    }
+
+	    public void setHomeDescription(String homeDescription) {
+	        this.homeDescription = homeDescription;
+	    }
+
+	    public String getAppNameNavbar() {
+	        return appNameNavbar;
+	    }
+
+	    public void setAppNameNavbar(String appNameNavbar) {
+	        this.appNameNavbar = appNameNavbar;
+	    }
+
+	    @Override
+	    public String toString() {
+	        return "UserInterface [appName=" + appName + ", homeDescription=" + homeDescription + ", appNameNavbar=" + appNameNavbar + "]";
+	    }
+	}
+
+
+	public static class Endpoints {
+		private List<String> toRemove;
+		private List<String> groupsToRemove;
+
+		public List<String> getToRemove() {
+			return toRemove;
+		}
+
+		public void setToRemove(List<String> toRemove) {
+			this.toRemove = toRemove;
+		}
+
+		public List<String> getGroupsToRemove() {
+			return groupsToRemove;
+		}
+
+		public void setGroupsToRemove(List<String> groupsToRemove) {
+			this.groupsToRemove = groupsToRemove;
+		}
+
+		@Override
+		public String toString() {
+			return "Endpoints [toRemove=" + toRemove + ", groupsToRemove=" + groupsToRemove + "]";
+		}
+
+		
+	}
+
+	public static class Metrics {
+		private Boolean enabled;
+
+		public Boolean getEnabled() {
+			return enabled;
+		}
+
+		public void setEnabled(Boolean enabled) {
+			this.enabled = enabled;
+		}
+
+		@Override
+		public String toString() {
+			return "Metrics [enabled=" + enabled + "]";
+		}
+
+		
+	}
+
+	public static class AutomaticallyGenerated {
+		private String key;
+
+		public String getKey() {
+			return key;
+		}
+
+		public void setKey(String key) {
+			this.key = key;
+		}
+
+		@Override
+		public String toString() {
+			return "AutomaticallyGenerated [key=" + (key != null && !key.isEmpty() ? "MASKED" : "NULL") + "]";
+		}
+		
+	}
+}
--- a/src/main/java/stirling/software/SPDF/model/Authority.java
+++ b/src/main/java/stirling/software/SPDF/model/Authority.java
@@ -0,0 +1,64 @@
+package stirling.software.SPDF.model;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "authorities")
+public class Authority {
+
+	public Authority() {
+
+	}
+	
+	
+	public Authority(String authority, User user) {
+	    this.authority = authority;
+	    this.user = user;
+	    user.getAuthorities().add(this);
+	}
+
+	
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "authority")
+    private String authority;
+
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private User user;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getAuthority() {
+		return authority;
+	}
+
+	public void setAuthority(String authority) {
+		this.authority = authority;
+	}
+
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+  
+}
--- a/src/main/java/stirling/software/SPDF/model/PDFText.java
+++ b/src/main/java/stirling/software/SPDF/model/PDFText.java
@@ -0,0 +1,42 @@
+package stirling.software.SPDF.model;
+public class PDFText {
+    private final int pageIndex;
+    private final float x1;
+    private final float y1;
+    private final float x2;
+    private final float y2;
+    private final String text;
+
+    public PDFText(int pageIndex, float x1, float y1, float x2, float y2, String text) {
+        this.pageIndex = pageIndex;
+        this.x1 = x1;
+        this.y1 = y1;
+        this.x2 = x2;
+        this.y2 = y2;
+        this.text = text;
+    }
+
+    public int getPageIndex() {
+        return pageIndex;
+    }
+
+    public float getX1() {
+        return x1;
+    }
+
+    public float getY1() {
+        return y1;
+    }
+
+    public float getX2() {
+        return x2;
+    }
+
+    public float getY2() {
+        return y2;
+    }
+
+    public String getText() {
+        return text;
+    }
+}
--- a/src/main/java/stirling/software/SPDF/model/PersistentLogin.java
+++ b/src/main/java/stirling/software/SPDF/model/PersistentLogin.java
@@ -0,0 +1,61 @@
+package stirling.software.SPDF.model;
+
+import java.util.Date;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "persistent_logins")
+public class PersistentLogin {
+
+    @Id
+    @Column(name = "series")
+    private String series;
+
+    @Column(name = "username", length = 64, nullable = false)
+    private String username;
+
+    @Column(name = "token", length = 64, nullable = false)
+    private String token;
+
+    @Column(name = "last_used", nullable = false)
+    private Date lastUsed;
+
+	public String getSeries() {
+		return series;
+	}
+
+	public void setSeries(String series) {
+		this.series = series;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public Date getLastUsed() {
+		return lastUsed;
+	}
+
+	public void setLastUsed(Date lastUsed) {
+		this.lastUsed = lastUsed;
+	}
+
+    
+    // Getters, setters, etc.
+}
--- a/src/main/java/stirling/software/SPDF/model/PipelineOperation.java
+++ b/src/main/java/stirling/software/SPDF/model/PipelineOperation.java
@@ -22,4 +22,11 @@ public class PipelineOperation {
        public void setParameters(Map<String, Object> parameters) {
            this.parameters = parameters;
        }
+
+		@Override
+		public String toString() {
+			return "PipelineOperation [operation=" + operation + ", parameters=" + parameters + "]";
+		}
+        
+        
    }
--- a/src/main/java/stirling/software/SPDF/model/Role.java
+++ b/src/main/java/stirling/software/SPDF/model/Role.java
@@ -0,0 +1,50 @@
+package stirling.software.SPDF.model;
+public enum Role {
+	
+	// Unlimited access
+    ADMIN("ROLE_ADMIN", Integer.MAX_VALUE, Integer.MAX_VALUE),
+
+    // Unlimited access
+    USER("ROLE_USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
+
+    // 40 API calls Per Day, 40 web calls
+    LIMITED_API_USER("ROLE_LIMITED_API_USER", 40, 40),
+
+    // 20 API calls Per Day, 20 web calls
+    EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20),
+
+    // 0 API calls per day and 20 web calls
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20);
+
+    private final String roleId;
+    private final int apiCallsPerDay;
+    private final int webCallsPerDay;
+
+    Role(String roleId, int apiCallsPerDay, int webCallsPerDay) {
+        this.roleId = roleId;
+        this.apiCallsPerDay = apiCallsPerDay;
+        this.webCallsPerDay = webCallsPerDay;
+    }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public int getApiCallsPerDay() {
+        return apiCallsPerDay;
+    }
+
+    public int getWebCallsPerDay() {
+        return webCallsPerDay;
+    }
+	    
+    public static Role fromString(String roleId) {
+        for (Role role : Role.values()) {
+            if (role.getRoleId().equalsIgnoreCase(roleId)) {
+                return role;
+            }
+        }
+        throw new IllegalArgumentException("No Role defined for id: " + roleId);
+    }
+	
+}
--- a/src/main/java/stirling/software/SPDF/model/User.java
+++ b/src/main/java/stirling/software/SPDF/model/User.java
@@ -0,0 +1,124 @@
+package stirling.software.SPDF.model;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+@Entity
+@Table(name = "users")
+public class User {
+
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "user_id")
+    private Long id;
+	
+    @Column(name = "username", unique = true)
+    private String username;
+
+    @Column(name = "password")
+    private String password;
+
+    @Column(name = "apiKey")
+    private String apiKey;
+    
+    @Column(name = "enabled")
+    private boolean enabled;
+
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user")
+    private Set<Authority> authorities = new HashSet<>();
+
+    @ElementCollection
+    @MapKeyColumn(name = "setting_key")
+    @Column(name = "setting_value")
+    @CollectionTable(name = "user_settings", joinColumns = @JoinColumn(name = "user_id"))
+    private Map<String, String> settings = new HashMap<>();  // Key-value pairs of settings.
+
+    
+    
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getApiKey() {
+		return apiKey;
+	}
+
+	public void setApiKey(String apiKey) {
+		this.apiKey = apiKey;
+	}
+
+	public Map<String, String> getSettings() {
+		return settings;
+	}
+
+	public void setSettings(Map<String, String> settings) {
+		this.settings = settings;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public Set<Authority> getAuthorities() {
+		return authorities;
+	}
+
+	public void setAuthorities(Set<Authority> authorities) {
+		this.authorities = authorities;
+	}
+	
+	public void addAuthorities(Set<Authority> authorities) {
+		this.authorities.addAll(authorities);
+	}
+	public void addAuthority(Authority authorities) {
+		this.authorities.add(authorities);
+	}
+	
+	public String getRolesAsString() {
+	    return this.authorities.stream()
+	                           .map(Authority::getAuthority)
+	                           .collect(Collectors.joining(", "));
+	}
+
+
+}
--- a/src/main/java/stirling/software/SPDF/pdf/TextFinder.java
+++ b/src/main/java/stirling/software/SPDF/pdf/TextFinder.java
@@ -0,0 +1,90 @@
+package stirling.software.SPDF.pdf;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.text.TextPosition;
+
+import stirling.software.SPDF.model.PDFText;
+
+public class TextFinder extends PDFTextStripper {
+
+	private final String searchText;
+	private final boolean useRegex;
+	private final boolean wholeWordSearch;
+	private final List<PDFText> textOccurrences = new ArrayList<>();
+
+	public TextFinder(String searchText, boolean useRegex, boolean wholeWordSearch) throws IOException {
+	    this.searchText = searchText.toLowerCase();
+	    this.useRegex = useRegex;
+	    this.wholeWordSearch = wholeWordSearch;
+	    setSortByPosition(true);
+	}
+
+	private List<Integer> findOccurrencesInText(String searchText, String content) {
+	    List<Integer> indexes = new ArrayList<>();
+	    Pattern pattern;
+
+	    if (useRegex) {
+	        // Use regex-based search
+	        pattern = wholeWordSearch 
+	            ? Pattern.compile("(\\b|_|\\.)" + searchText + "(\\b|_|\\.)") 
+	            : Pattern.compile(searchText);
+	    } else {
+	        // Use normal text search
+	        pattern = wholeWordSearch 
+		            ? Pattern.compile("(\\b|_|\\.)" + Pattern.quote(searchText) + "(\\b|_|\\.)") 
+		    	            : Pattern.compile(Pattern.quote(searchText));
+	    }
+
+	    Matcher matcher = pattern.matcher(content);
+	    while (matcher.find()) {
+	        indexes.add(matcher.start());
+	    }
+	    return indexes;
+	}
+	
+	@Override
+	protected void writeString(String text, List<TextPosition> textPositions) {
+	    for (Integer index : findOccurrencesInText(searchText, text.toLowerCase())) {
+	        if (index + searchText.length() <= textPositions.size()) {
+	            // Initial values based on the first character
+	            TextPosition first = textPositions.get(index);
+	            float minX = first.getX();
+	            float minY = first.getY();
+	            float maxX = first.getX() + first.getWidth();
+	            float maxY = first.getY() + first.getHeight();
+
+	            // Loop over the rest of the characters and adjust bounding box values
+	            for (int i = index; i < index + searchText.length(); i++) {
+	                TextPosition position = textPositions.get(i);
+	                minX = Math.min(minX, position.getX());
+	                minY = Math.min(minY, position.getY());
+	                maxX = Math.max(maxX, position.getX() + position.getWidth());
+	                maxY = Math.max(maxY, position.getY() + position.getHeight());
+	            }
+
+	            textOccurrences.add(new PDFText(
+	                    getCurrentPageNo() - 1,
+	                    minX,
+	                    minY,
+	                    maxX,
+	                    maxY,
+	                    text
+	            ));
+	        }
+	    }
+	}
+
+	public List<PDFText> getTextLocations(PDDocument document) throws Exception {
+		this.getText(document);
+		System.out.println("Found " + textOccurrences.size() + " occurrences of '" + searchText + "' in the document.");
+
+		return textOccurrences;
+	}
+
+}
--- a/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java
+++ b/src/main/java/stirling/software/SPDF/repository/AuthorityRepository.java
@@ -0,0 +1,12 @@
+package stirling.software.SPDF.repository;
+
+import java.util.Set;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import stirling.software.SPDF.model.Authority;
+
+public interface AuthorityRepository extends JpaRepository<Authority, Long> { 
+    //Set<Authority> findByUsername(String username);
+    Set<Authority> findByUser_Username(String username);
+}
--- a/src/main/java/stirling/software/SPDF/repository/JPATokenRepositoryImpl.java
+++ b/src/main/java/stirling/software/SPDF/repository/JPATokenRepositoryImpl.java
@@ -0,0 +1,53 @@
+package stirling.software.SPDF.repository;
+
+import java.util.Date;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.web.authentication.rememberme.PersistentRememberMeToken;
+import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+
+import stirling.software.SPDF.model.PersistentLogin;
+
+public class JPATokenRepositoryImpl implements PersistentTokenRepository {
+
+    @Autowired
+    private PersistentLoginRepository persistentLoginRepository;
+
+    @Override
+    public void createNewToken(PersistentRememberMeToken token) {
+        PersistentLogin newToken = new PersistentLogin();
+        newToken.setSeries(token.getSeries());
+        newToken.setUsername(token.getUsername());
+        newToken.setToken(token.getTokenValue());
+        newToken.setLastUsed(token.getDate());
+        persistentLoginRepository.save(newToken);
+    }
+
+    @Override
+    public void updateToken(String series, String tokenValue, Date lastUsed) {
+        PersistentLogin existingToken = persistentLoginRepository.findById(series).orElse(null);
+        if (existingToken != null) {
+            existingToken.setToken(tokenValue);
+            existingToken.setLastUsed(lastUsed);
+            persistentLoginRepository.save(existingToken);
+        }
+    }
+
+    @Override
+    public PersistentRememberMeToken getTokenForSeries(String seriesId) {
+        PersistentLogin token = persistentLoginRepository.findById(seriesId).orElse(null);
+        if (token != null) {
+            return new PersistentRememberMeToken(token.getUsername(), token.getSeries(), token.getToken(), token.getLastUsed());
+        }
+        return null;
+    }
+
+    @Override
+    public void removeUserTokens(String username) {
+        for (PersistentLogin token : persistentLoginRepository.findAll()) {
+            if (token.getUsername().equals(username)) {
+                persistentLoginRepository.delete(token);
+            }
+        }
+    }
+}
--- a/src/main/java/stirling/software/SPDF/repository/PersistentLoginRepository.java
+++ b/src/main/java/stirling/software/SPDF/repository/PersistentLoginRepository.java
@@ -0,0 +1,8 @@
+package stirling.software.SPDF.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import stirling.software.SPDF.model.PersistentLogin;
+
+public interface PersistentLoginRepository extends JpaRepository<PersistentLogin, String> {
+}
--- a/src/main/java/stirling/software/SPDF/repository/UserRepository.java
+++ b/src/main/java/stirling/software/SPDF/repository/UserRepository.java
@@ -0,0 +1,13 @@
+package stirling.software.SPDF.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import stirling.software.SPDF.model.User;
+
+public interface UserRepository extends JpaRepository<User, String> {
+    Optional<User> findByUsername(String username);
+    User findByApiKey(String apiKey);
+}
+
--- a/src/main/java/stirling/software/SPDF/utils/FileToPdf.java
+++ b/src/main/java/stirling/software/SPDF/utils/FileToPdf.java
@@ -0,0 +1,95 @@
+package stirling.software.SPDF.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
+
+public class FileToPdf {
+	 public static byte[] convertHtmlToPdf(byte[] fileBytes, String fileName) throws IOException, InterruptedException {
+	    	
+	    	Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+	        Path tempInputFile = null;
+	        byte[] pdfBytes;
+	        try {
+		        if (fileName.endsWith(".html")) {
+		            tempInputFile = Files.createTempFile("input_", ".html");
+		            Files.write(tempInputFile, fileBytes);
+		        } else {
+		            tempInputFile = unzipAndGetMainHtml(fileBytes);
+		        }
+	
+		        List<String> command = new ArrayList<>();
+		        command.add("weasyprint");
+		        command.add(tempInputFile.toString()); 
+		        command.add(tempOutputFile.toString());
+		        ProcessExecutorResult returnCode;
+		        if (fileName.endsWith(".zip")) {	        	
+		        	returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
+	                .runCommandWithOutputHandling(command, tempInputFile.getParent().toFile());
+		        } else {
+	
+		        	returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.WEASYPRINT)
+		                                        .runCommandWithOutputHandling(command);
+		        }
+	
+		        pdfBytes = Files.readAllBytes(tempOutputFile);
+	        } finally {
+		        // Clean up temporary files
+		        Files.delete(tempOutputFile);
+		        Files.delete(tempInputFile);
+		        
+		        if (fileName.endsWith(".zip")) {
+		        	GeneralUtils.deleteDirectory(tempInputFile.getParent());
+		        }
+	        }
+	        
+	        return pdfBytes;
+	    }
+	    
+
+	    private static Path unzipAndGetMainHtml(byte[] fileBytes) throws IOException {
+	        Path tempDirectory = Files.createTempDirectory("unzipped_");
+	        try (ZipInputStream zipIn = new ZipInputStream(new ByteArrayInputStream(fileBytes))) {
+	            ZipEntry entry = zipIn.getNextEntry();
+	            while (entry != null) {
+	                Path filePath = tempDirectory.resolve(entry.getName());
+	                if (entry.isDirectory()) {
+	                    Files.createDirectories(filePath);  // Explicitly create the directory structure
+	                } else {
+	                    Files.createDirectories(filePath.getParent()); // Create parent directories if they don't exist
+	                    Files.copy(zipIn, filePath);
+	                }
+	                zipIn.closeEntry();
+	                entry = zipIn.getNextEntry();
+	            }
+	        }
+
+	        //search for the main HTML file.
+	        try (Stream<Path> walk = Files.walk(tempDirectory)) {
+	            List<Path> htmlFiles = walk.filter(file -> file.toString().endsWith(".html"))
+	                                       .collect(Collectors.toList());
+
+	            if (htmlFiles.isEmpty()) {
+	                throw new IOException("No HTML files found in the unzipped directory.");
+	            }
+
+	            // Prioritize 'index.html' if it exists, otherwise use the first .html file
+	            for (Path htmlFile : htmlFiles) {
+	                if (htmlFile.getFileName().toString().equals("index.html")) {
+	                    return htmlFile;
+	                }
+	            }
+
+	            return htmlFiles.get(0);
+	        }
+	    }
+}
--- a/src/main/java/stirling/software/SPDF/utils/GeneralUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/GeneralUtils.java
@@ -1,91 +1,153 @@
-package stirling.software.SPDF.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class GeneralUtils {
-
-	public static Long convertSizeToBytes(String sizeStr) {
-	    if (sizeStr == null) {
-	        return null;
-	    }
-	
-	    sizeStr = sizeStr.trim().toUpperCase();
-	    try {
-	        if (sizeStr.endsWith("KB")) {
-	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
-	        } else if (sizeStr.endsWith("MB")) {
-	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024 * 1024);
-	        } else if (sizeStr.endsWith("GB")) {
-	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024 * 1024 * 1024);
-	        } else if (sizeStr.endsWith("B")) {
-	            return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
-	        } else {
-	            // Input string does not have a valid format, handle this case
-	        }
-	    } catch (NumberFormatException e) {
-	        // The numeric part of the input string cannot be parsed, handle this case
-	    }
-	    
-	    return null;
-	}
-
-	public static List<Integer> parsePageList(String[] pageOrderArr, int totalPages) {
-	    List<Integer> newPageOrder = new ArrayList<>();
-
-	    // loop through the page order array
-	    for (String element : pageOrderArr) {
-	        // check if the element contains a range of pages
-	        if (element.matches("\\d*n\\+?-?\\d*|\\d*\\+?n")) {
-	            // Handle page order as a function
-	            int coefficient = 0;
-	            int constant = 0;
-	            boolean coefficientExists = false;
-	            boolean constantExists = false;
-
-	            if (element.contains("n")) {
-	                String[] parts = element.split("n");
-	                if (!parts[0].equals("") && parts[0] != null) {
-	                    coefficient = Integer.parseInt(parts[0]);
-	                    coefficientExists = true;
-	                }
-	                if (parts.length > 1 && !parts[1].equals("") && parts[1] != null) {
-	                    constant = Integer.parseInt(parts[1]);
-	                    constantExists = true;
-	                }
-	            } else if (element.contains("+")) {
-	                constant = Integer.parseInt(element.replace("+", ""));
-	                constantExists = true;
-	            }
-
-	            for (int i = 1; i <= totalPages; i++) {
-	                int pageNum = coefficientExists ? coefficient * i : i;
-	                pageNum += constantExists ? constant : 0;
-
-	                if (pageNum <= totalPages && pageNum > 0) {
-	                    newPageOrder.add(pageNum - 1);
-	                }
-	            }
-	        } else if (element.contains("-")) {
-	            // split the range into start and end page
-	            String[] range = element.split("-");
-	            int start = Integer.parseInt(range[0]);
-	            int end = Integer.parseInt(range[1]);
-	            // check if the end page is greater than total pages
-	            if (end > totalPages) {
-	                end = totalPages;
-	            }
-	            // loop through the range of pages
-	            for (int j = start; j <= end; j++) {
-	                // print the current index
-	                newPageOrder.add(j - 1);
-	            }
-	        } else {
-	            // if the element is a single page
-	            newPageOrder.add(Integer.parseInt(element) - 1);
-	        }
-	    }
-
-	    return newPageOrder;
-	}
-}
+package stirling.software.SPDF.utils;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+public class GeneralUtils {
+
+	public static void deleteDirectory(Path path) throws IOException {
+        Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.delete(file);
+                return FileVisitResult.CONTINUE;
+            }
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                Files.delete(dir);
+                return FileVisitResult.CONTINUE;
+            }
+        });
+    }
+
+	public static String convertToFileName(String name) {
+        String safeName = name.replaceAll("[^a-zA-Z0-9]", "_");
+        if (safeName.length() > 50) {
+            safeName = safeName.substring(0, 50);
+        }
+        return safeName;
+    }
+	
+	
+	public static boolean isValidURL(String urlStr) {
+	    try {
+	        new URL(urlStr);
+	        return true;
+	    } catch (MalformedURLException e) {
+	        return false;
+	    }
+	}
+
+	
+	public static Long convertSizeToBytes(String sizeStr) {
+	    if (sizeStr == null) {
+	        return null;
+	    }
+	
+	    sizeStr = sizeStr.trim().toUpperCase();
+	    try {
+	        if (sizeStr.endsWith("KB")) {
+	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
+	        } else if (sizeStr.endsWith("MB")) {
+	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024 * 1024);
+	        } else if (sizeStr.endsWith("GB")) {
+	            return (long) (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024 * 1024 * 1024);
+	        } else if (sizeStr.endsWith("B")) {
+	            return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
+	        } else {
+	            // Input string does not have a valid format, handle this case
+	        }
+	    } catch (NumberFormatException e) {
+	        // The numeric part of the input string cannot be parsed, handle this case
+	    }
+	    
+	    return null;
+	}
+
+	public static List<Integer> parsePageList(String[] pageOrderArr, int totalPages) {
+	    List<Integer> newPageOrder = new ArrayList<>();
+
+	    // loop through the page order array
+	    for (String element : pageOrderArr) {
+	    	if (element.equalsIgnoreCase("all")) {
+	            for (int i = 0; i < totalPages; i++) {
+	                newPageOrder.add(i);
+	            }
+	            // As all pages are already added, no need to check further
+	            break;
+	        }
+	    	else if (element.matches("\\d*n\\+?-?\\d*|\\d*\\+?n")) {
+	            // Handle page order as a function
+	            int coefficient = 0;
+	            int constant = 0;
+	            boolean coefficientExists = false;
+	            boolean constantExists = false;
+
+	            if (element.contains("n")) {
+	                String[] parts = element.split("n");
+	                if (!parts[0].equals("") && parts[0] != null) {
+	                    coefficient = Integer.parseInt(parts[0]);
+	                    coefficientExists = true;
+	                }
+	                if (parts.length > 1 && !parts[1].equals("") && parts[1] != null) {
+	                    constant = Integer.parseInt(parts[1]);
+	                    constantExists = true;
+	                }
+	            } else if (element.contains("+")) {
+	                constant = Integer.parseInt(element.replace("+", ""));
+	                constantExists = true;
+	            }
+
+	            for (int i = 1; i <= totalPages; i++) {
+	                int pageNum = coefficientExists ? coefficient * i : i;
+	                pageNum += constantExists ? constant : 0;
+
+	                if (pageNum <= totalPages && pageNum > 0) {
+	                    newPageOrder.add(pageNum - 1);
+	                }
+	            }
+	        } else if (element.contains("-")) {
+	            // split the range into start and end page
+	            String[] range = element.split("-");
+	            int start = Integer.parseInt(range[0]);
+	            int end = Integer.parseInt(range[1]);
+	            // check if the end page is greater than total pages
+	            if (end > totalPages) {
+	                end = totalPages;
+	            }
+	            // loop through the range of pages
+	            for (int j = start; j <= end; j++) {
+	                // print the current index
+	                newPageOrder.add(j - 1);
+	            }
+	        } else {
+	            // if the element is a single page
+	            newPageOrder.add(Integer.parseInt(element) - 1);
+	        }
+	    }
+
+	    return newPageOrder;
+	}
+	public static boolean createDir(String path) {
+		Path folder = Paths.get(path);
+	    if (!Files.exists(folder)) {
+	        try {
+	            Files.createDirectories(folder);
+	        } catch (IOException e) {
+	            e.printStackTrace();
+	            return false;
+	        }
+	    }
+	    return true;
+	}
+}
--- a/src/main/java/stirling/software/SPDF/utils/PDFToFile.java
+++ b/src/main/java/stirling/software/SPDF/utils/PDFToFile.java
@@ -20,6 +20,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;

+import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
+
 public class PDFToFile {
    public ResponseEntity<byte[]> processPdfToOfficeFormat(MultipartFile inputFile, String outputFormat, String libreOfficeFilter) throws IOException, InterruptedException {

@@ -53,7 +55,7 @@ public class PDFToFile {
            // Run the LibreOffice command
            List<String> command = new ArrayList<>(
                    Arrays.asList("soffice", "--infilter=" + libreOfficeFilter, "--convert-to", outputFormat, "--outdir", tempOutputDir.toString(), tempInputFile.toString()));
-            int returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);
+            ProcessExecutorResult returnCode = ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE).runCommandWithOutputHandling(command);

            // Get output files
            List<File> outputFiles = Arrays.asList(tempOutputDir.toFile().listFiles());
--- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
@@ -32,10 +32,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;

-import com.itextpdf.kernel.pdf.PdfPage;
-import com.itextpdf.kernel.pdf.canvas.parser.PdfTextExtractor;
-import com.itextpdf.kernel.pdf.canvas.parser.listener.SimpleTextExtractionStrategy;
-
 import stirling.software.SPDF.pdf.ImageFinder;

 public class PdfUtils {
@@ -44,7 +40,7 @@ public class PdfUtils {


 	public static PDRectangle textToPageSize(String size) {
-		switch (size) {
+		switch (size.toUpperCase()) {
 		case "A0":
 			return PDRectangle.A0;
 		case "A1":
@@ -68,43 +64,37 @@ public class PdfUtils {
 		}
 	}

-    public boolean hasImageInFile(PDDocument pdfDocument, String text, String pagesToCheck) throws IOException {
-        PDFTextStripper textStripper = new PDFTextStripper();
-        String pdfText = "";

-        if(pagesToCheck == null || pagesToCheck.equals("all")) {
-            pdfText = textStripper.getText(pdfDocument);
-        } else {
-            // remove whitespaces
-            pagesToCheck = pagesToCheck.replaceAll("\\s+", "");
+    
+    
+    public static boolean hasImages(PDDocument document, String pagesToCheck) throws IOException {
+        String[] pageOrderArr = pagesToCheck.split(",");
+        List<Integer> pageList = GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());

-            String[] splitPoints = pagesToCheck.split(",");
-            for (String splitPoint : splitPoints) {
-                if (splitPoint.contains("-")) {
-                    // Handle page ranges
-                    String[] range = splitPoint.split("-");
-                    int startPage = Integer.parseInt(range[0]);
-                    int endPage = Integer.parseInt(range[1]);
-
-                    for (int i = startPage; i <= endPage; i++) {
-                        textStripper.setStartPage(i);
-                        textStripper.setEndPage(i);
-                        pdfText += textStripper.getText(pdfDocument);
-                    }
-                } else {
-                    // Handle individual page
-                    int page = Integer.parseInt(splitPoint);
-                    textStripper.setStartPage(page);
-                    textStripper.setEndPage(page);
-                    pdfText += textStripper.getText(pdfDocument);
-                }
+        for (int pageNumber : pageList) {
+            PDPage page = document.getPage(pageNumber);
+            if (hasImagesOnPage(page)) {
+                return true;
            }
        }

-        pdfDocument.close();
-
-        return pdfText.contains(text);
+        return false;
    }
+
+    public static boolean hasText(PDDocument document, String pageNumbersToCheck, String phrase) throws IOException {
+        String[] pageOrderArr = pageNumbersToCheck.split(",");
+        List<Integer> pageList = GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
+
+        for (int pageNumber : pageList) {
+            PDPage page = document.getPage(pageNumber);
+            if (hasTextOnPage(page, phrase)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
    
    public static boolean hasImagesOnPage(PDPage page) throws IOException {
        ImageFinder imageFinder = new ImageFinder(page);
@@ -113,12 +103,17 @@ public class PdfUtils {
    }
    
    
-    public static boolean hasText(PDDocument  document, String phrase) throws IOException {
-    	PDFTextStripper pdfStripper = new PDFTextStripper();
-        String text = pdfStripper.getText(document);
-        return text.contains(phrase);
-   }
    
+
+    public static boolean hasTextOnPage(PDPage page, String phrase) throws IOException {
+        PDFTextStripper textStripper = new PDFTextStripper();
+        PDDocument tempDoc = new PDDocument();
+        tempDoc.addPage(page);
+        String pageText = textStripper.getText(tempDoc);
+        tempDoc.close();
+        return pageText.contains(phrase);
+    }
+
    
    public boolean containsTextInFile(PDDocument pdfDocument, String text, String pagesToCheck) throws IOException {
        PDFTextStripper textStripper = new PDFTextStripper();
--- a/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java
+++ b/src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java
@@ -1,6 +1,7 @@
 package stirling.software.SPDF.utils;

 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -13,7 +14,7 @@ import java.util.concurrent.Semaphore;
 public class ProcessExecutor {

    public enum Processes {
-        LIBRE_OFFICE, OCR_MY_PDF, PYTHON_OPENCV, GHOSTSCRIPT
+        LIBRE_OFFICE, OCR_MY_PDF, PYTHON_OPENCV, GHOSTSCRIPT, WEASYPRINT
    }

    private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
@@ -25,6 +26,7 @@ public class ProcessExecutor {
            case OCR_MY_PDF -> 2;
            case PYTHON_OPENCV -> 8;
            case GHOSTSCRIPT -> 16;
+            case WEASYPRINT -> 16;
            };
            return new ProcessExecutor(semaphoreLimit);
        });
@@ -35,14 +37,22 @@ public class ProcessExecutor {
    private ProcessExecutor(int semaphoreLimit) {
        this.semaphore = new Semaphore(semaphoreLimit);
    }
-
-    public int runCommandWithOutputHandling(List<String> command) throws IOException, InterruptedException {
+    public ProcessExecutorResult runCommandWithOutputHandling(List<String> command) throws IOException, InterruptedException {
+    	return runCommandWithOutputHandling(command, null);
+    }
+    public ProcessExecutorResult runCommandWithOutputHandling(List<String> command, File workingDirectory) throws IOException, InterruptedException {
        int exitCode = 1;
+        String messages = "";
        semaphore.acquire();
        try {

            System.out.print("Running command: " + String.join(" ", command));
            ProcessBuilder processBuilder = new ProcessBuilder(command);
+            
+            // Use the working directory if it's set
+            if (workingDirectory != null) {
+                processBuilder.directory(workingDirectory);
+            }
            Process process = processBuilder.start();

            // Read the error stream and standard output stream concurrently
@@ -80,14 +90,16 @@ public class ProcessExecutor {
            // Wait for the reader threads to finish
            errorReaderThread.join();
            outputReaderThread.join();
-
+           
            if (outputLines.size() > 0) {
                String outputMessage = String.join("\n", outputLines);
+                messages += outputMessage;
                System.out.println("Command output:\n" + outputMessage);
            }

            if (errorLines.size() > 0) {
                String errorMessage = String.join("\n", errorLines);
+                messages += errorMessage;
                System.out.println("Command error output:\n" + errorMessage);
                if (exitCode != 0) {
                    throw new IOException("Command process failed with exit code " + exitCode + ". Error message: " + errorMessage);
@@ -96,7 +108,28 @@ public class ProcessExecutor {
        } finally {
            semaphore.release();
        }
-        return exitCode;
+        return new ProcessExecutorResult(exitCode, messages);
+    }
+    public class ProcessExecutorResult{
+    	int rc;
+    	String messages;
+    	public ProcessExecutorResult(int rc, String messages) {
+    		this.rc = rc;
+    		this.messages = messages;
+    	}
+		public int getRc() {
+			return rc;
+		}
+		public void setRc(int rc) {
+			this.rc = rc;
+		}
+		public String getMessages() {
+			return messages;
+		}
+		public void setMessages(String messages) {
+			this.messages = messages;
+		}
+    	
+    	
    }
-
 }
--- a/src/main/java/stirling/software/SPDF/utils/PropertyConfigs.java
+++ b/src/main/java/stirling/software/SPDF/utils/PropertyConfigs.java
@@ -0,0 +1,49 @@
+package stirling.software.SPDF.utils;
+
+import java.util.List;
+
+public class PropertyConfigs {
+
+	
+	public static boolean getBooleanValue(List<String> keys, boolean defaultValue) {
+	    for (String key : keys) {
+	        String value = System.getProperty(key);
+	        if (value == null)
+	            value = System.getenv(key);
+	        
+	        if (value != null)
+	            return Boolean.valueOf(value);
+	    }
+	    return defaultValue;
+	}
+
+	public static String getStringValue(List<String> keys, String defaultValue) {
+	    for (String key : keys) {
+	        String value = System.getProperty(key);
+	        if (value == null)
+	            value = System.getenv(key);
+	        
+	        if (value != null)
+	            return value;
+	    }
+	    return defaultValue;
+	}
+
+	
+	
+	
+	public static boolean getBooleanValue(String key, boolean defaultValue) {
+        String value = System.getProperty(key);
+        if (value == null) 
+            value = System.getenv(key);
+        return (value != null) ? Boolean.valueOf(value) : defaultValue;
+    }
+
+	public static String getStringValue(String key, String defaultValue) {
+        String value = System.getProperty(key);
+        if (value == null)
+            value = System.getenv(key);
+        return (value != null) ? value : defaultValue;
+    }
+    
+}
--- a/src/main/java/stirling/software/SPDF/utils/WebResponseUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/WebResponseUtils.java
@@ -1,50 +1,78 @@
-package stirling.software.SPDF.utils;
-
-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;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-
-public class WebResponseUtils {
-
-	public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName) throws IOException {
-	    return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), docName);
-	}
-
-	public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName, MediaType mediaType) throws IOException {
-	    return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), docName, mediaType);
-	}
-
-	public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName, MediaType mediaType) throws IOException {
-	
-	    // Return the PDF as a response
-	    HttpHeaders headers = new HttpHeaders();
-	    headers.setContentType(mediaType);
-	    headers.setContentLength(bytes.length);
-	    String encodedDocName = URLEncoder.encode(docName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
-	    headers.setContentDispositionFormData("attachment", encodedDocName);
-	    return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
-	}
-
-	public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName) throws IOException {
-	    return bytesToWebResponse(bytes, docName, MediaType.APPLICATION_PDF);
-	}
-
-	public static ResponseEntity<byte[]> pdfDocToWebResponse(PDDocument document, String docName) throws IOException {
-	
-	    // Open Byte Array and save document to it
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    document.save(baos);
-	    // Close the document
-	    document.close();
-	
-	    return boasToWebResponse(baos, docName);
-	}
-
-}
+package stirling.software.SPDF.utils;
+
+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;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfWriter;
+
+public class WebResponseUtils {
+
+	public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName) throws IOException {
+	    return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), docName);
+	}
+
+	public static ResponseEntity<byte[]> boasToWebResponse(ByteArrayOutputStream baos, String docName, MediaType mediaType) throws IOException {
+	    return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), docName, mediaType);
+	}
+
+
+	public static ResponseEntity<byte[]> multiPartFileToWebResponse(MultipartFile file) throws IOException {
+	    String fileName = file.getOriginalFilename();
+	    MediaType mediaType = MediaType.parseMediaType(file.getContentType());
+
+	    byte[] bytes = file.getBytes();
+	
+	    return bytesToWebResponse(bytes, fileName, mediaType);
+	}
+
+	public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName, MediaType mediaType) throws IOException {
+	
+	    // Return the PDF as a response
+	    HttpHeaders headers = new HttpHeaders();
+	    headers.setContentType(mediaType);
+	    headers.setContentLength(bytes.length);
+	    String encodedDocName = URLEncoder.encode(docName, StandardCharsets.UTF_8.toString()).replaceAll("\\+", "%20");
+	    headers.setContentDispositionFormData("attachment", encodedDocName);
+	    return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
+	}
+
+	public static ResponseEntity<byte[]> bytesToWebResponse(byte[] bytes, String docName) throws IOException {
+	    return bytesToWebResponse(bytes, docName, MediaType.APPLICATION_PDF);
+	}
+
+	public static ResponseEntity<byte[]> pdfDocToWebResponse(PDDocument document, String docName) throws IOException {
+	
+	    // Open Byte Array and save document to it
+	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	    document.save(baos);
+	    // Close the document
+	    document.close();
+	
+	    return boasToWebResponse(baos, docName);
+	}
+	
+	public static ResponseEntity<byte[]> pdfDocToWebResponse(PdfDocument document, String docName) throws IOException {
+	    
+	    // Open Byte Array and save document to it
+	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	    PdfWriter writer = new PdfWriter(baos);
+	    PdfDocument newDocument = new PdfDocument(writer);
+	    
+	    document.copyPagesTo(1, document.getNumberOfPages(), newDocument);
+	    newDocument.close();
+	    
+	    return boasToWebResponse(baos, docName);
+	}
+	
+
+}
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -16,13 +16,30 @@ server.error.include-stacktrace=always
 server.error.include-exception=true
 server.error.include-message=always

+#logging.level.org.springframework.web=DEBUG
+#logging.level.org.springframework=DEBUG
+#logging.level.org.springframework.security=DEBUG
+
+
 server.servlet.session.tracking-modes=cookie
-server.servlet.context-path=${APP_ROOT_PATH:/}
+server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}

 spring.devtools.restart.enabled=true
 spring.devtools.livereload.enabled=true

 spring.thymeleaf.encoding=UTF-8 

-server.connection-timeout=${CONNECTION_TIMEOUT:5m}
-spring.mvc.async.request-timeout=${ASYNC_CONNECTION_TIMEOUT:300000}
+server.connection-timeout=${SYSTEM_CONNECTIONTIMEOUTMINUTES:5m}
+spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:300000}
+
+spring.resources.static-locations=file:customFiles/static/
+#spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/
+#spring.thymeleaf.cache=false
+
+
+spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
+spring.h2.console.enabled=true
+spring.jpa.hibernate.ddl-auto=update
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
--- a/src/main/resources/messages_ca_CA.properties
+++ b/src/main/resources/messages_ca_CA.properties
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -21,141 +21,446 @@ filesSelected=files selected
 noFavourites=No favourites added
 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
+
+#############
+#  NAVBAR   #
+#############
+navbar.convert=Convert
+navbar.security=Security
+navbar.other=Other
+navbar.darkmode=Dark Mode
+navbar.pageOps=Page Operations
+navbar.settings=Settings
+
+#############
+#  SETTINGS #
+#############
+settings.title=Settings
+settings.update=Update 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
+
+account.title=Account Settings
+account.accountSettings=Account Settings
+account.adminSettings=Admin Settings - View and Add Users
+account.userControlSettings=User Control Settings
+account.changeUsername=New Username
+account.changeUsername=Change 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
+
+
+adminUserSettings.title=User Control Settings
+adminUserSettings.header=Admin User Control Settings
+adminUserSettings.admin=Admin
+adminUserSettings.user=User
+adminUserSettings.addUser=Add New User
+adminUserSettings.roles=Roles
+adminUserSettings.role=Role
+adminUserSettings.actions=Actions
+adminUserSettings.apiUser=Limited API User
+adminUserSettings.webOnlyUser=Web Only User
+adminUserSettings.submit=Save User
+
 #############
 # HOME-PAGE #
 #############
 home.desc=Your locally hosted one-stop-shop for all your PDF needs.


-navbar.convert=Convert
-navbar.security=Security
-navbar.other=Other
-navbar.darkmode=Dark Mode
-navbar.pageOps=Page Operations
-
 home.multiTool.title=PDF Multi Tool
 home.multiTool.desc=Merge, Rotate, Rearrange, and Remove pages
+multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side,interactive,intractable,move

 home.merge.title=Merge
 home.merge.desc=Easily merge multiple PDFs into one.
+merge.tags=merge,Page operations,Back end,server side

 home.split.title=Split
 home.split.desc=Split PDFs into multiple documents
+split.tags=Page operations,divide,Multi Page,cut,server side 

 home.rotate.title=Rotate
 home.rotate.desc=Easily rotate your PDFs.
+rotate.tags=server side
+

 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.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.pdfOrganiser.title=Organise
 home.pdfOrganiser.desc=Remove/Rearrange pages in any order
+pdfOrganiser.tags=duplex,even,odd,sort,move
+

 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.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.permissions.title=Change Permissions
 home.permissions.desc=Change the permissions of your PDF document
+permissions.tags=read,write,edit,print
+

 home.removePages.title=Remove
 home.removePages.desc=Delete unwanted pages from your PDF document.
+removePages.tags=Remove pages,delete pages

 home.addPassword.title=Add Password
 home.addPassword.desc=Encrypt your PDF document with a password.
+addPassword.tags=secure,security

 home.removePassword.title=Remove Password
 home.removePassword.desc=Remove password protection from your PDF document.
+removePassword.tags=secure,Decrypt,security,unpassword,delete password

 home.compressPdfs.title=Compress
 home.compressPdfs.desc=Compress PDFs to reduce their file size.
+compressPdfs.tags=squish,small,tiny
+

 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.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.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.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.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.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.PDFToPresentation.title=PDF to Presentation
 home.PDFToPresentation.desc=Convert PDF to Presentation formats (PPT, PPTX and ODP)
+PDFToPresentation.tags=slides,show,office,microsoft

-home.PDFToText.title=PDF to Text/RTF
+home.PDFToText.title=PDF to RTF (Text)
 home.PDFToText.desc=Convert PDF to Text or RTF format
+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.PDFToXML.title=PDF to XML
 home.PDFToXML.desc=Convert PDF to XML format
+PDFToXML.tags=data-extraction,structured-content,interop,transformation,convert

 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.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.flatten.title=Flatten
 home.flatten.desc=Remove all interactive elements and forms from a PDF
+flatten.tags=static,deactivate,non-interactive,streamline

 home.repair.title=Repair
 home.repair.desc=Tries to repair a corrupt/broken PDF
+repair.tags=fix,restore,correction,recover

 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.compare.title=Compare
 home.compare.desc=Compares and shows the differences between 2 PDF Documents
+compare.tags=differentiate,contrast,changes,analysis

 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.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.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.pipeline.title=Pipeline
-home.pipeline.desc=Pipeline desc.
+home.pipeline.title=Pipeline (Advanced)
+home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
+pipeline.tags=automate,sequence,scripted,batch-process

-error.pdfPassword=The PDF Document is passworded and either the password was not provided or was incorrect
+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

-downloadPdf=Download PDF
-text=Text
-font=Font
-selectFillter=-- Select --
-pageNum=Page Number 
+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.adjust-contrast.title=Adjust Colors/Contrast
+home.adjust-contrast.desc=Adjust Contrast, Saturation and Brightness of a PDF
+adjust-contrast.tags=color-correction,tune,modify,enhance
+
+home.crop.title=Crop PDF
+home.crop.desc=Crop a PDF to reduce its size (maintains text!)
+crop.tags=trim,shrink,edit,shape
+
+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.sanitizePdf.title=Sanitize
+home.sanitizePdf.desc=Remove scripts and other elements from PDF files
+sanitizePdf.tags=clean,secure,safe,remove-threats
+
+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.HTMLToPDF.title=HTML to PDF
+home.HTMLToPDF.desc=Converts any HTML file or zip to PDF
+HTMLToPDF.tags=markup,web-content,transformation,convert
+
+
+home.MarkdownToPDF.title=Markdown to PDF
+home.MarkdownToPDF.desc=Converts any Markdown file to PDF
+MarkdownToPDF.tags=markup,web-content,transformation,convert
+
+
+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.extractPage.title=Extract page(s)
+home.extractPage.desc=Extracts select pages from PDF
+extractPage.tags=extract
+
+
+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.showJS.title=Show Javascript
+home.showJS.desc=Searches and displays any JS injected into a PDF
+showJS.tags=JS
+
+home.autoRedact.title=Auto Redact
+home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
+showJS.tags=Redact,Hide,black out,black,marker,hidden
+
+###########################
+#                         #
+#       WEB PAGES         #
+#                         #
+###########################
+#login
+login.title=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
+
+
+#auto-redact
+autoRedact.title=Auto Redact
+autoRedact.header=Auto Redact
+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
+
+
+#showJS
+showJS.title=Show Javascript
+showJS.header=Show Javascript
+showJS.downloadJS=Download Javascript
+showJS.submit=Show
+
+
+#pdfToSinglePage
+pdfToSinglePage.title=PDF To Single Page
+pdfToSinglePage.header=PDF To Single Page
+pdfToSinglePage.submit=Convert To Single Page
+
+
+#pageExtracter
+pageExtracter.title=Extract Pages
+pageExtracter.header=Extract Pages
+pageExtracter.submit=Extract
+
+
+#getPdfInfo
+getPdfInfo.title=Get Info on PDF
+getPdfInfo.header=Get Info on PDF
+getPdfInfo.submit=Get Info
+getPdfInfo.downloadJson=Download JSON
+
+
+#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
+
+
+
+#url-to-pdf
+URLToPDF.title=URL To PDF
+URLToPDF.header=URL To PDF
+URLToPDF.submit=Convert
+URLToPDF.credit=Uses 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
+
+
+#sanitizePDF
+sanitizePDF.title=Sanitize PDF
+sanitizePDF.header=Sanitize a PDF file
+sanitizePDF.selectText.1=Remove JavaScript actions
+sanitizePDF.selectText.2=Remove embedded files
+sanitizePDF.selectText.3=Remove metadata
+sanitizePDF.selectText.4=Remove links
+sanitizePDF.selectText.5=Remove fonts
+sanitizePDF.submit=Sanitize 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
+
+
+#auto-rename
+auto-rename.title=Auto Rename
+auto-rename.header=Auto Rename PDF
+auto-rename.submit=Auto Rename
+
+
+#adjustContrast
+adjustContrast.title=Adjust Contrast
+adjustContrast.header=Adjust Contrast
+adjustContrast.contrast=Contrast:
+adjustContrast.brightness=Brightness:
+adjustContrast.saturation=Saturation:
+adjustContrast.download=Download
+
+
+#crop
+crop.title=Crop
+crop.header=Crop Image
+crop.submit=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.dividerDownload1=Download 'Auto Splitter Divider (minimal).pdf'
+autoSplitPDF.dividerDownload2=Download 'Auto Splitter Divider (with instructions).pdf'
+autoSplitPDF.submit=Submit
+
+
+#pipeline
 pipeline.title=Pipeline

+
+#pageLayout
 pageLayout.title=Multi Page Layout
 pageLayout.header=Multi Page Layout
 pageLayout.pagesPerSheet=Pages per sheet:
 pageLayout.submit=Submit

+
+#scalePages
 scalePages.title=Adjust page-scale
 scalePages.header=Adjust page-scale
 scalePages.pageSize=Size of a page of the document.
 scalePages.scaleFactor=Zoom level (crop) of a page.
 scalePages.submit=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: 
@@ -167,26 +472,29 @@ 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.name=Name                     
 certSign.submit=Sign PDF


-
+#removeBlanks
 removeBlanks.title=Remove Blanks
 removeBlanks.header=Remove Blank Pages
-removeBlanks.threshold=Threshold:
-removeBlanks.thresholdDesc=Threshold for determining how white a white pixel must be
+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 to be removed
+removeBlanks.whitePercentDesc=Percent of page that must be 'white' pixels to be removed
 removeBlanks.submit=Remove Blanks

+
+#compare
 compare.title=Compare
 compare.header=Compare PDFs
 compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Compare

+
+#sign
 sign.title=Sign
 sign.header=Sign PDFs
 sign.upload=Upload Image
@@ -195,14 +503,20 @@ sign.text=Text Input
 sign.clear=Clear
 sign.add=Add

+
+#repair
 repair.title=Repair
 repair.header=Repair PDFs
 repair.submit=Repair

+
+#flatten
 flatten.title=Flatten
 flatten.header=Flatten PDFs
 flatten.submit=Flatten

+
+#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:
@@ -214,19 +528,6 @@ ScannerImageSplit.selectText.8=Sets the minimum contour area threshold for a pho
 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).

-navbar.settings=Settings
-settings.title=Settings
-settings.update=Update 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
-
-
-
-                            
                            
 #OCR
 ocr.title=OCR / Scan Cleanup
@@ -248,7 +549,7 @@ ocr.credit=This service uses OCRmyPDF and Tesseract for OCR.
 ocr.submit=Process PDF with OCR


-
+#extractImages
 extractImages.title=Extract Images
 extractImages.header=Extract Images
 extractImages.selectText=Select image format to convert extracted images to
@@ -286,13 +587,17 @@ addImage.submit=Add image
 #merge
 merge.title=Merge
 merge.header=Merge multiple PDFs (2+)
+merge.sortByName=Sort by name
+merge.sortByDate=Sort by date
 merge.submit=Merge

+
 #pdfOrganiser
 pdfOrganiser.title=Page Organiser
 pdfOrganiser.header=PDF Page Organiser
 pdfOrganiser.submit=Rearrange Pages

+
 #multiTool
 multiTool.title=PDF Multi Tool
 multiTool.header=PDF Multi Tool
@@ -304,6 +609,7 @@ pageRemover.header=PDF Page remover
 pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
 pageRemover.submit=Delete Pages

+
 #rotate
 rotate.title=Rotate PDF
 rotate.header=Rotate PDF
@@ -311,8 +617,6 @@ rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
 rotate.submit=Rotate


-
-
 #merge
 split.title=Split PDF
 split.header=Split PDF
@@ -337,20 +641,22 @@ 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
+    
                                   
 #pdfToImage
 pdfToImage.title=PDF to Image
 pdfToImage.header=PDF to Image
 pdfToImage.selectText=Image Format
-pdfToImage.singleOrMultiple=Image result type
-pdfToImage.single=Single Big Image
-pdfToImage.multi=Multiple Images
+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

+
 #addPassword
 addPassword.title=Add Password
 addPassword.header=Add password (Encrypt)
@@ -372,6 +678,7 @@ addPassword.selectText.15=Restricts what can be done with the document once it i
 addPassword.selectText.16=Restricts the opening of the document itself
 addPassword.submit=Encrypt

+
 #watermark
 watermark.title=Add Watermark
 watermark.header=Add Watermark
@@ -382,14 +689,10 @@ watermark.selectText.4=Rotation (0-360):
 watermark.selectText.5=widthSpacer (Space between each watermark horizontally):
 watermark.selectText.6=heightSpacer (Space between each watermark vertically):
 watermark.selectText.7=Opacity (0% - 100%):
+watermark.selectText.8=Watermark Type:
+watermark.selectText.9=Watermark Image:
 watermark.submit=Add Watermark

-#remove-watermark
-remove-watermark.title=Remove Watermark
-remove-watermark.header=Remove Watermark
-remove-watermark.selectText.1=Select PDF to remove watermark from:
-remove-watermark.selectText.2=Watermark Text:
-remove-watermark.submit=Remove Watermark

 #Change permissions
 permissions.title=Change Permissions
@@ -407,6 +710,7 @@ permissions.selectText.9=Prevent printing
 permissions.selectText.10=Prevent printing different formats
 permissions.submit=Change

+
 #remove password
 removePassword.title=Remove password
 removePassword.header=Remove password (Decrypt)
@@ -414,6 +718,8 @@ removePassword.selectText.1=Select PDF to Decrypt
 removePassword.selectText.2=Password
 removePassword.submit=Remove

+
+#changeMetadata
 changeMetadata.title=Change Metadata
 changeMetadata.header=Change Metadata
 changeMetadata.selectText.1=Please edit the variables you wish to change
@@ -432,27 +738,30 @@ changeMetadata.selectText.4=Other Metadata:
 changeMetadata.selectText.5=Add Custom Metadata Entry
 changeMetadata.submit=Change

+
+#xlsToPdf
 xlsToPdf.title=Excel to PDF
 xlsToPdf.header=Excel to PDF
 xlsToPdf.selectText.1=Select XLS or XLSX Excel sheet to convert
 xlsToPdf.convert=convert


-
-
+#pdfToPDFA
 pdfToPDFA.title=PDF To PDF/A
 pdfToPDFA.header=PDF To PDF/A
 pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert


-
+#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

+
+#PDFToPresentation
 PDFToPresentation.title=PDF to Presentation
 PDFToPresentation.header=PDF to Presentation
 PDFToPresentation.selectText.1=Output file format
@@ -460,31 +769,23 @@ PDFToPresentation.credit=This service uses LibreOffice for file conversion.
 PDFToPresentation.submit=Convert


-PDFToText.title=PDF to Text/RTF
-PDFToText.header=PDF to Text/RTF
+#PDFToText
+PDFToText.title=PDF to RTF (Text)
+PDFToText.header=PDF to RTF (Text)
 PDFToText.selectText.1=Output file format
 PDFToText.credit=This service uses LibreOffice for file conversion.
 PDFToText.submit=Convert


+#PDFToHTML
 PDFToHTML.title=PDF to HTML
 PDFToHTML.header=PDF to HTML
 PDFToHTML.credit=This service uses LibreOffice for file conversion.
 PDFToHTML.submit=Convert

+
+#PDFToXML
 PDFToXML.title=PDF to XML
 PDFToXML.header=PDF to XML
 PDFToXML.credit=This service uses LibreOffice for file conversion.
-PDFToXML.submit=Convert
-
-
-
-
-
-
-
-
-
-
-
-
+PDFToXML.submit=Convert
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -0,0 +1,794 @@
+###########
+# Generic #
+###########
+# the direction that the language is written (ltr=left to right, rtl = right to left)
+language.direction=ltr
+
+pdfPrompt=Select PDF(s)
+multiPdfPrompt=Select PDFs (2+)
+multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
+imgPrompt=Select Image(s)
+genericSubmit=Submit
+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) :
+goToPage=Go
+true=True
+false=False
+unknown=Unknown
+save=Save
+close=Close
+filesSelected=files selected
+noFavourites=No favorites added
+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
+
+#############
+#  NAVBAR   #
+#############
+navbar.convert=Convert
+navbar.security=Security
+navbar.other=Other
+navbar.darkmode=Dark Mode
+navbar.pageOps=Page Operations
+navbar.settings=Settings
+
+#############
+#  SETTINGS #
+#############
+settings.title=Settings
+settings.update=Update 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
+
+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.changeUsername=Change 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
+
+
+adminUserSettings.title=User Control Settings
+adminUserSettings.header=Admin User Control Settings
+adminUserSettings.admin=Admin
+adminUserSettings.user=User
+adminUserSettings.addUser=Add New User
+adminUserSettings.roles=Roles
+adminUserSettings.role=Role
+adminUserSettings.actions=Actions
+adminUserSettings.apiUser=Limited API User
+adminUserSettings.webOnlyUser=Web Only User
+adminUserSettings.submit=Save User
+
+#############
+# HOME-PAGE #
+#############
+home.desc=Your locally hosted one-stop-shop for all your PDF needs.
+
+
+home.multiTool.title=PDF Multi Tool
+home.multiTool.desc=Merge, Rotate, Rearrange, and Remove pages
+multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side,interactive,intractable,move
+
+home.merge.title=Merge
+home.merge.desc=Easily merge multiple PDFs into one.
+merge.tags=merge,Page operations,Back end,server side
+
+home.split.title=Split
+home.split.desc=Split PDFs into multiple documents
+split.tags=Page operations,divide,Multi Page,cut,server side
+
+home.rotate.title=Rotate
+home.rotate.desc=Easily rotate your PDFs.
+rotate.tags=server side
+
+
+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.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.pdfOrganiser.title=Organize
+home.pdfOrganiser.desc=Remove/Rearrange pages in any order
+pdfOrganiser.tags=duplex,even,odd,sort,move
+
+
+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.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.permissions.title=Change Permissions
+home.permissions.desc=Change the permissions of your PDF document
+permissions.tags=read,write,edit,print
+
+
+home.removePages.title=Remove
+home.removePages.desc=Delete unwanted pages from your PDF document.
+removePages.tags=Remove pages,delete pages
+
+home.addPassword.title=Add Password
+home.addPassword.desc=Encrypt your PDF document with a password.
+addPassword.tags=secure,security
+
+home.removePassword.title=Remove Password
+home.removePassword.desc=Remove password protection from your PDF document.
+removePassword.tags=secure,Decrypt,security,unpassword,delete password
+
+home.compressPdfs.title=Compress
+home.compressPdfs.desc=Compress PDFs to reduce their file size.
+compressPdfs.tags=squish,small,tiny
+
+
+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.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.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.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.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.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.PDFToPresentation.title=PDF to Presentation
+home.PDFToPresentation.desc=Convert PDF to Presentation formats (PPT, PPTX and ODP)
+PDFToPresentation.tags=slides,show,office,microsoft
+
+home.PDFToText.title=PDF to RTF (Text)
+home.PDFToText.desc=Convert PDF to Text or RTF format
+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.PDFToXML.title=PDF to XML
+home.PDFToXML.desc=Convert PDF to XML format
+PDFToXML.tags=data-extraction,structured-content,interop,transformation,convert
+
+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.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.flatten.title=Flatten
+home.flatten.desc=Remove all interactive elements and forms from a PDF
+flatten.tags=static,deactivate,non-interactive,streamline
+
+home.repair.title=Repair
+home.repair.desc=Tries to repair a corrupt/broken PDF
+repair.tags=fix,restore,correction,recover
+
+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.compare.title=Compare
+home.compare.desc=Compares and shows the differences between 2 PDF Documents
+compare.tags=differentiate,contrast,changes,analysis
+
+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.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.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.pipeline.title=Pipeline (Advanced)
+home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
+pipeline.tags=automate,sequence,scripted,batch-process
+
+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.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.adjust-contrast.title=Adjust Colors/Contrast
+home.adjust-contrast.desc=Adjust Contrast, Saturation and Brightness of a PDF
+adjust-contrast.tags=color-correction,tune,modify,enhance
+
+home.crop.title=Crop PDF
+home.crop.desc=Crop a PDF to reduce its size (maintains text!)
+crop.tags=trim,shrink,edit,shape
+
+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.sanitizePdf.title=Sanitize
+home.sanitizePdf.desc=Remove scripts and other elements from PDF files
+sanitizePdf.tags=clean,secure,safe,remove-threats
+
+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.HTMLToPDF.title=HTML to PDF
+home.HTMLToPDF.desc=Converts any HTML file or zip to PDF
+HTMLToPDF.tags=markup,web-content,transformation,convert
+
+
+home.MarkdownToPDF.title=Markdown to PDF
+home.MarkdownToPDF.desc=Converts any Markdown file to PDF
+MarkdownToPDF.tags=markup,web-content,transformation,convert
+
+
+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.extractPage.title=Extract page(s)
+home.extractPage.desc=Extracts select pages from PDF
+extractPage.tags=extract
+
+
+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.showJS.title=Show Javascript
+home.showJS.desc=Searches and displays any JS injected into a PDF
+showJS.tags=JS
+
+home.autoRedact.title=Auto Redact
+home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
+showJS.tags=JS
+
+###########################
+#                         #
+#       WEB PAGES         #
+#                         #
+###########################
+#login
+##########################
+###  TODO: Translate   ###
+##########################
+login.title=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
+
+
+#auto-redact
+autoRedact.title=Auto Redact
+autoRedact.header=Auto Redact
+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
+
+
+#showJS
+showJS.title=Show Javascript
+showJS.header=Show Javascript
+showJS.downloadJS=Download Javascript
+showJS.submit=Show
+
+
+#pdfToSinglePage
+pdfToSinglePage.title=PDF To Single Page
+pdfToSinglePage.header=PDF To Single Page
+pdfToSinglePage.submit=Convert To Single Page
+
+
+#pageExtracter
+pageExtracter.title=Extract Pages
+pageExtracter.header=Extract Pages
+pageExtracter.submit=Extract
+
+
+#getPdfInfo
+getPdfInfo.title=Get Info on PDF
+getPdfInfo.header=Get Info on PDF
+getPdfInfo.submit=Get Info
+getPdfInfo.downloadJson=Download JSON
+
+
+#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
+
+
+
+#url-to-pdf
+URLToPDF.title=URL To PDF
+URLToPDF.header=URL To PDF
+URLToPDF.submit=Convert
+URLToPDF.credit=Uses 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
+
+
+#sanitizePDF
+sanitizePDF.title=Sanitize PDF
+sanitizePDF.header=Sanitize a PDF file
+sanitizePDF.selectText.1=Remove JavaScript actions
+sanitizePDF.selectText.2=Remove embedded files
+sanitizePDF.selectText.3=Remove metadata
+sanitizePDF.selectText.4=Remove links
+sanitizePDF.selectText.5=Remove fonts
+sanitizePDF.submit=Sanitize 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
+
+
+#auto-rename
+auto-rename.title=Auto Rename
+auto-rename.header=Auto Rename PDF
+auto-rename.submit=Auto Rename
+
+
+#adjustContrast
+adjustContrast.title=Adjust Contrast
+adjustContrast.header=Adjust Contrast
+adjustContrast.contrast=Contrast:
+adjustContrast.brightness=Brightness:
+adjustContrast.saturation=Saturation:
+adjustContrast.download=Download
+
+
+#crop
+crop.title=Crop
+crop.header=Crop Image
+crop.submit=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.dividerDownload1=Download 'Auto Splitter Divider (minimal).pdf'
+autoSplitPDF.dividerDownload2=Download 'Auto Splitter Divider (with instructions).pdf'
+autoSplitPDF.submit=Submit
+
+
+#pipeline
+pipeline.title=Pipeline
+
+
+#pageLayout
+pageLayout.title=Multi Page Layout
+pageLayout.header=Multi Page Layout
+pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.submit=Submit
+
+
+#scalePages
+scalePages.title=Adjust page-scale
+scalePages.header=Adjust page-scale
+scalePages.pageSize=Size of a page of the document.
+scalePages.scaleFactor=Zoom level (crop) of a page.
+scalePages.submit=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.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.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.submit=Sign PDF
+
+
+#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
+
+
+#compare
+compare.title=Compare
+compare.header=Compare PDFs
+compare.document.1=Document 1
+compare.document.2=Document 2
+compare.submit=Compare
+
+
+#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
+
+
+#repair
+repair.title=Repair
+repair.header=Repair PDFs
+repair.submit=Repair
+
+
+#flatten
+flatten.title=Flatten
+flatten.header=Flatten PDFs
+flatten.submit=Flatten
+
+
+#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 color variation around the estimated background color (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).
+
+                            
+#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 OCRmyPDF and Tesseract for OCR.
+ocr.submit=Process PDF with OCR
+
+
+#extractImages
+extractImages.title=Extract Images
+extractImages.header=Extract Images
+extractImages.selectText=Select image format to convert extracted images to
+extractImages.submit=Extract
+
+
+#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.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
+
+
+#compress
+compress.title=Compress
+compress.header=Compress PDF
+compress.credit=This service uses Ghostscript for PDF Compress/Optimisation.
+compress.selectText.1=Manual Mode - From 1 to 4
+compress.selectText.2=Optimization level:
+compress.selectText.3=4 (Terrible for text images)
+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
+
+
+#Add image
+addImage.title=Add Image
+addImage.header=Add image to PDF
+addImage.everyPage=Every Page?
+addImage.upload=Add image
+addImage.submit=Add image
+
+
+#merge
+merge.title=Merge
+merge.header=Merge multiple PDFs (2+)
+merge.sortByName=Sort by name
+merge.sortByDate=Sort by date
+merge.submit=Merge
+
+
+#pdfOrganiser
+pdfOrganiser.title=Page Organizer
+pdfOrganiser.header=PDF Page Organizer
+pdfOrganiser.submit=Rearrange Pages
+
+
+#multiTool
+multiTool.title=PDF Multi Tool
+multiTool.header=PDF Multi Tool
+
+
+#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
+
+
+#rotate
+rotate.title=Rotate PDF
+rotate.header=Rotate PDF
+rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
+rotate.submit=Rotate
+
+
+#merge
+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-8 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 and 6
+split.desc.6=Document #4: Page 7
+split.desc.7=Document #5: Page 8
+split.desc.8=Document #6: Page 9 and 10
+split.splitPages=Enter pages to split on:
+split.submit=Split
+
+
+#merge
+imageToPDF.title=Image to PDF
+imageToPDF.header=Image to PDF
+imageToPDF.submit=Convert
+imageToPDF.selectText.1=Stretch to fit
+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
+    
+                                   
+#pdfToImage
+pdfToImage.title=PDF to Image
+pdfToImage.header=PDF to Image
+pdfToImage.selectText=Image Format
+pdfToImage.singleOrMultiple=Image result type
+pdfToImage.single=Single Big Image
+pdfToImage.multi=Multiple Images
+pdfToImage.colorType=Color type
+pdfToImage.color=Color
+pdfToImage.grey=Grayscale
+pdfToImage.blackwhite=Black and White (May lose data!)
+pdfToImage.submit=Convert
+
+
+#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.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
+
+
+#watermark
+watermark.title=Add Watermark
+watermark.header=Add Watermark
+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=widthSpacer (Space between each watermark horizontally):
+watermark.selectText.6=heightSpacer (Space between each watermark vertically):
+watermark.selectText.7=Opacity (0% - 100%):
+watermark.selectText.8=Watermark Type:
+watermark.selectText.9=Watermark Image:
+watermark.submit=Add Watermark
+
+
+#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
+
+
+#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
+
+
+#changeMetadata
+changeMetadata.title=Title:
+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.title=Title:
+changeMetadata.trapped=Trapped:
+changeMetadata.selectText.4=Other Metadata:
+changeMetadata.selectText.5=Add Custom Metadata Entry
+changeMetadata.submit=Change
+
+
+#xlsToPdf
+xlsToPdf.title=Excel to PDF
+xlsToPdf.header=Excel to PDF
+xlsToPdf.selectText.1=Select XLS or XLSX Excel sheet to convert
+xlsToPdf.convert=convert
+
+
+#pdfToPDFA
+pdfToPDFA.title=PDF To PDF/A
+pdfToPDFA.header=PDF To PDF/A
+pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
+pdfToPDFA.submit=Convert
+
+
+#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
+
+
+#PDFToPresentation
+PDFToPresentation.title=PDF to Presentation
+PDFToPresentation.header=PDF to Presentation
+PDFToPresentation.selectText.1=Output file format
+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.credit=This service uses LibreOffice for file conversion.
+PDFToText.submit=Convert
+
+
+#PDFToHTML
+PDFToHTML.title=PDF to HTML
+PDFToHTML.header=PDF to HTML
+PDFToHTML.credit=This service uses LibreOffice for file conversion.
+PDFToHTML.submit=Convert
+
+
+#PDFToXML
+PDFToXML.title=PDF to XML
+PDFToXML.header=PDF to XML
+PDFToXML.credit=This service uses LibreOffice for file conversion.
+PDFToXML.submit=Convert
--- a/src/main/resources/messages_es_ES.properties
+++ b/src/main/resources/messages_es_ES.properties
--- a/src/main/resources/messages_eu_ES.properties
+++ b/src/main/resources/messages_eu_ES.properties
@@ -1,7 +1,7 @@
 ###########
 # Generic #
 ###########
-# the direction that the language is written (ltr = left to right, rtl = right to left)
+# the direction that the language is written (ltr=left to right, rtl = right to left)
 language.direction=ltr

 pdfPrompt=Hautatu PDFa(k)
@@ -21,138 +21,449 @@ filesSelected=Hautatutako fitxategiak
 noFavourites=Ez dira gogokoak gehitu
 bored=Itxaroten aspertuta?
 alphabet=Alfabetoa
-#############
-# HOME-PAGE #
-#############
-home.desc=Zure leihatila bakarra autoostatatua zure PDF behar guztietarako
+downloadPdf=PDFa deskargatu
+text=Testua
+font=Letra-tipoa
+selectFillter=-- Select --
+pageNum=Orrialde-zenbakia
+sizes.small=Small
+sizes.medium=Medium
+sizes.large=Large
+sizes.x-large=X-Large
+error.pdfPassword=PDF dokumentua pasahitzarekin babestuta dago eta pasahitza ez da sartu edo akastuna da
+delete=Delete
+username=Username
+password=Password
+welcome=Welcome
+=Property

+#############
+#  NAVBAR   #
+#############
 navbar.convert=Bihurtu
 navbar.security=Segurtasuna
 navbar.other=Beste bat
 navbar.darkmode=Modu iluna
 navbar.pageOps=Orrialde-eragiketak
+navbar.settings=Ezarpenak
+
+#############
+#  SETTINGS #
+#############
+settings.title=Ezarpenak
+settings.update=Eguneratze eskuragarria
+settings.appVersion=Aplikazioaren bertsioa:
+settings.downloadOption.title=Hautatu deskargatzeko aukera (fitxategi bakarra deskargatzeko ZIP gabe):
+settings.downloadOption.1=Ireki leiho berean
+settings.downloadOption.2=Ireki leiho berrian
+settings.downloadOption.3=Deskargatu fitxategia
+settings.zipThreshold=ZIP fitxategiak deskargatutako fitxategi kopurua gainditzen denean
+settings.signOut=Sign Out
+settings.accountSettings=Account Settings
+
+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.changeUsername=Change 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
+
+
+adminUserSettings.title=User Control Settings
+adminUserSettings.header=Admin User Control Settings
+adminUserSettings.admin=Admin
+adminUserSettings.user=User
+adminUserSettings.addUser=Add New User
+adminUserSettings.roles=Roles
+adminUserSettings.role=Role
+adminUserSettings.actions=Actions
+adminUserSettings.apiUser=Limited API User
+adminUserSettings.webOnlyUser=Web Only User
+adminUserSettings.submit=Save User
+
+#############
+# HOME-PAGE #
+#############
+home.desc=Zure leihatila bakarra autoostatatua zure PDF behar guztietarako
+

 home.multiTool.title=Erabilera anitzeko tresna PDF
-home.multiTool.desc= Orriak konbinatu, biratu, berrantolatu eta ezabatu
+home.multiTool.desc=Orriak konbinatu, biratu, berrantolatu eta ezabatu
+multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side

 home.merge.title=Elkartu
-home.merge.desc=Elkartu zenbait PDF dokumentu bakar batean modu errazean 
+home.merge.desc=Elkartu zenbait PDF dokumentu bakar batean modu errazean
+merge.tags=merge,Page operations,Back end,server side

 home.split.title=Zatitu
 home.split.desc=Zatitu PDFak zenbait dokumentutan
+split.tags=Page operations,divide,Multi Page,cut,server side

 home.rotate.title=Biratu
 home.rotate.desc=Biratu PDFak modu errazean
+rotate.tags=server side
+

 home.imageToPdf.title=Irudia PDF bihurtu
 home.imageToPdf.desc=Irudi bat(PNG, JPEG, GIF)PDF bihurtu
+imageToPdf.tags=conversion,img,jpg,picture,photo

 home.pdfToImage.title=PDFa irudi bihurtu
 home.pdfToImage.desc=PDF bat irudi (PNG, JPEG, GIF) bihurtu
+pdfToImage.tags=conversion,img,jpg,picture,photo

 home.pdfOrganiser.title=Antolatzailea
 home.pdfOrganiser.desc=Ezabatu/Berrantolatu orrialdeak edozein ordenatan
+pdfOrganiser.tags=duplex,even,odd,sort,move
+

 home.addImage.title=Gehitu irudia PDFari
 home.addImage.desc=Gehitu irudi bat PDFan ezarritako kokaleku batean (lanean)
+addImage.tags=img,jpg,picture,photo

 home.watermark.title=Gehitu ur-marka
 home.watermark.desc=Gehitu aurrez zehaztutako ur-marka bat PFD dokumentuari
-
-home.remove-watermark.title= Ezabatu ur-marka
-home.remove-watermark.desc= Ezabatu ur-marka PDF dokumentutik
+watermark.tags=Text,repeating,label,own,copyright,trademark,img,jpg,picture,photo

 home.permissions.title=Aldatu baimenak
 home.permissions.desc=Aldatu PDF dokumentuaren baimenak
+permissions.tags=read,write,edit,print
+

 home.removePages.title=Ezabatu
 home.removePages.desc=Ezabatu nahi ez dituzun orrialdeak PDF dokumentutik
+removePages.tags=Remove pages,delete pages

-home.addPassword.title=Gehitu pasahitza 
+home.addPassword.title=Gehitu pasahitza
 home.addPassword.desc=Enkriptatu PDF dokumentua pasahitz batekin
+addPassword.tags=secure,security

 home.removePassword.title=Ezabatu pasahitza
 home.removePassword.desc=Ezabatu pasahitza PDF dokumentutik
+removePassword.tags=secure,Decrypt,security,unpassword,delete password

 home.compressPdfs.title=Konprimatu
 home.compressPdfs.desc=Konprimatu PDFak fitxategiaren tamaina murrizteko
+compressPdfs.tags=squish,small,tiny
+

 home.changeMetadata.title=Aldatu metadatuak
-home.changeMetadata.desc=Aldatu/Ezabatu/Gehitu metadatuak PDF dokumentuari  
+home.changeMetadata.desc=Aldatu/Ezabatu/Gehitu metadatuak PDF dokumentuari
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats

 home.fileToPDF.title=Fitxategia PDF bihurtu
 home.fileToPDF.desc=PDF bihurtu ia edozein fitxategi (DOCX, PNG, XLS, PPT, TXT eta gehiago)
+fileToPDF.tags=transformation,format,document,picture,slide,text,conversion,office,docs,word,excel,powerpoint

 home.ocr.title=OCR exekutatu PDFan eta/edo garbiketa-eskaneatzeak
 home.ocr.desc=Garbiketa-eskaneatzeak eta irudi-testuak detektatu PDF baten barruan eta berriz ere gehitu testu gisa
+ocr.tags=recognition,text,image,scan,read,identify,detection,editable
+

 home.extractImages.title=Atera irudiak
 home.extractImages.desc=Atera irudi guztiak PDF batetik eta ZIPen gorde
+extractImages.tags=picture,photo,save,archive,zip,capture,grab

 home.pdfToPDFA.title=PDFa PDF/A bihurtu
 home.pdfToPDFA.desc=PDFa PDF/A bihurtu luzaro biltegiratzeko
+pdfToPDFA.tags=archive,long-term,standard,conversion,storage,preservation

 home.PDFToWord.title=PDFa Word Bihurtu
 home.PDFToWord.desc=PDF formatuak Word bihurtu (DOC, DOCX y ODT)
+PDFToWord.tags=doc,docx,odt,word,transformation,format,conversion,office,microsoft,docfile

 home.PDFToPresentation.title=PDFa aurkezpen bihurtu
 home.PDFToPresentation.desc=PDFa aurkezpen formatu bihurtu (PPT, PPTX y ODP)
+PDFToPresentation.tags=slides,show,office,microsoft

 home.PDFToText.title=PDFa TXT edo RTF bihurtu
 home.PDFToText.desc=PDFa TXT edo RTF formatu bihurtu
+PDFToText.tags=richformat,richtextformat,rich text format

 home.PDFToHTML.title=PDFa HTML bihurtu
 home.PDFToHTML.desc=PDFa HTML formatu bihurtu
+PDFToHTML.tags=web content,browser friendly
+

 home.PDFToXML.title=PDFa XML bihurtu
 home.PDFToXML.desc=PDFa XML formatu bihurtu
+PDFToXML.tags=data-extraction,structured-content,interop,transformation,convert

 home.ScannerImageSplit.title=Detektatu/Zatitu argazki eskaneatuak
 home.ScannerImageSplit.desc=Hainbat argazki zatitu argazki/PDF baten barruan
+ScannerImageSplit.tags=separate,auto-detect,scans,multi-photo,organize

 home.sign.title=Sinatu
 home.sign.desc=Gehitu sinadura PDFari marrazki, testu edo irudi bidez
+sign.tags=authorize,initials,drawn-signature,text-sign,image-signature

 home.flatten.title=Lautu
 home.flatten.desc=PDF batetik elementu eta inprimaki interaktibo guztiak ezabatu
+flatten.tags=static,deactivate,non-interactive,streamline

 home.repair.title=Konpondu
 home.repair.desc=Saiatu PDF hondatu/kaltetu bat konpontzen
+repair.tags=fix,restore,correction,recover

 home.removeBlanks.title=Ezabatu orrialde zuriak
 home.removeBlanks.desc=Detektatu orrialde zuriak eta dokumentutik ezabatu
-
-home.certSign.title=Sinatu ziurtagiriarekin
-home.certSign.desc=Sinatu PDF bat Ziurtagiri/Gako batekin (PEM/P12)
+removeBlanks.tags=cleanup,streamline,non-content,organize

 home.compare.title=Konparatu
 home.compare.desc=Konparatu eta erakutsi 2 PDF dokumenturen aldeak
+compare.tags=differentiate,contrast,changes,analysis
+
+home.certSign.title=Sinatu ziurtagiriarekin
+home.certSign.desc=Sinatu PDF bat Ziurtagiri/Gako batekin (PEM/P12)
+certSign.tags=authenticate,PEM,P12,official,encrypt

 home.pageLayout.title=Zenbait orrialderen diseinua
-home.pageLayout.desc=Elkartu orri bakar batean PDF dokumentu baten zenbait orrialde 
+home.pageLayout.desc=Elkartu orri bakar batean PDF dokumentu baten zenbait orrialde
+pageLayout.tags=merge,composite,single-view,organize

 home.scalePages.title=Eskalatu/Doitu orrialdearen tamaina
 home.scalePages.desc=Eskalatu/Aldatu orrialde baten tamaina eta/edo edukia
+scalePages.tags=resize,modify,dimension,adapt

-error.pdfPassword=PDF dokumentua pasahitzarekin babestuta dago eta pasahitza ez da sartu edo akastuna da
+home.pipeline.title=Pipeline (Advanced)
+home.pipeline.desc=Run multiple actions on PDFs by defining pipeline scripts
+pipeline.tags=automate,sequence,scripted,batch-process

-downloadPdf=PDFa deskargatu
-text=Testua
-font=Letra-tipoa
-selectFilter=-- Hautatu --
-pageNum=Orrialde-zenbakia
+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.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.adjust-contrast.title=Adjust Colors/Contrast
+home.adjust-contrast.desc=Adjust Contrast, Saturation and Brightness of a PDF
+adjust-contrast.tags=color-correction,tune,modify,enhance
+
+home.crop.title=Crop PDF
+home.crop.desc=Crop a PDF to reduce its size (maintains text!)
+crop.tags=trim,shrink,edit,shape
+
+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.sanitizePdf.title=Sanitize
+home.sanitizePdf.desc=Remove scripts and other elements from PDF files
+sanitizePdf.tags=clean,secure,safe,remove-threats
+
+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.HTMLToPDF.title=HTML to PDF
+home.HTMLToPDF.desc=Converts any HTML file or zip to PDF
+HTMLToPDF.tags=markup,web-content,transformation,convert
+
+
+home.MarkdownToPDF.title=Markdown to PDF
+home.MarkdownToPDF.desc=Converts any Markdown file to PDF
+MarkdownToPDF.tags=markup,web-content,transformation,convert
+
+
+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.extractPage.title=Extract page(s)
+home.extractPage.desc=Extracts select pages from PDF
+extractPage.tags=extract
+
+
+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.showJS.title=Show Javascript
+home.showJS.desc=Searches and displays any JS injected into a PDF
+showJS.tags=JS
+
+home.autoRedact.title=Auto Redact
+home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
+showJS.tags=JS
+
+###########################
+#                         #
+#       WEB PAGES         #
+#                         #
+###########################
+#login
+##########################
+###  TODO: Translate   ###
+##########################
+login.title=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
+
+
+#auto-redact
+autoRedact.title=Auto Redact
+autoRedact.header=Auto Redact
+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
+
+
+#showJS
+showJS.title=Show Javascript
+showJS.header=Show Javascript
+showJS.downloadJS=Download Javascript
+showJS.submit=Show
+
+
+#pdfToSinglePage
+pdfToSinglePage.title=PDF To Single Page
+pdfToSinglePage.header=PDF To Single Page
+pdfToSinglePage.submit=Convert To Single Page
+
+
+#pageExtracter
+pageExtracter.title=Extract Pages
+pageExtracter.header=Extract Pages
+pageExtracter.submit=Extract
+
+
+#getPdfInfo
+getPdfInfo.title=Get Info on PDF
+getPdfInfo.header=Get Info on PDF
+getPdfInfo.submit=Get Info
+getPdfInfo.downloadJson=Download JSON
+
+
+#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
+
+
+
+#url-to-pdf
+URLToPDF.title=URL To PDF
+URLToPDF.header=URL To PDF
+URLToPDF.submit=Convert
+URLToPDF.credit=Uses 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
+
+
+#sanitizePDF
+sanitizePDF.title=Sanitize PDF
+sanitizePDF.header=Sanitize a PDF file
+sanitizePDF.selectText.1=Remove JavaScript actions
+sanitizePDF.selectText.2=Remove embedded files
+sanitizePDF.selectText.3=Remove metadata
+sanitizePDF.selectText.4=Remove links
+sanitizePDF.selectText.5=Remove fonts
+sanitizePDF.submit=Sanitize 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
+
+
+#auto-rename
+auto-rename.title=Auto Rename
+auto-rename.header=Auto Rename PDF
+auto-rename.submit=Auto Rename
+
+
+#adjustContrast
+adjustContrast.title=Adjust Contrast
+adjustContrast.header=Adjust Contrast
+adjustContrast.contrast=Contrast:
+adjustContrast.brightness=Brightness:
+adjustContrast.saturation=Saturation:
+adjustContrast.download=Download
+
+
+#crop
+crop.title=Crop
+crop.header=Crop Image
+crop.submit=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.dividerDownload1=Download 'Auto Splitter Divider (minimal).pdf'
+autoSplitPDF.dividerDownload2=Download 'Auto Splitter Divider (with instructions).pdf'
+autoSplitPDF.submit=Submit
+
+
+#pipeline
+pipeline.title=Pipeline
+
+
+#pageLayout
 pageLayout.title=Hainbat orrialderen diseinua
 pageLayout.header=Hainbat orrialderen diseinua
 pageLayout.pagesPerSheet=Orrialdeak orriko:
 pageLayout.submit=Entregatu

+
+#scalePages
 scalePages.title=Doitu orrialdearen eskala
 scalePages.header=Doitu orrialdearen eskala
 scalePages.pageSize=Dokumentuaren orrialdearen tamaina
 scalePages.scaleFactor=Orriaren zoom maila (moztea)
 scalePages.submit=Entregatu

+
+#certSign
 certSign.title=Ziurtagiriaren sinadura
 certSign.header=Sinatu PDF bat haren ziurtagiriarekin (lanean)
 certSign.selectPDF=Hautatu PDF fitxategi bat sinatzeko:
@@ -167,6 +478,8 @@ certSign.location=Kokalekua
 certSign.name=Izena
 certSign.submit=Sinatu PDFa

+
+#removeBlanks
 removeBlanks.title=Ezabatu zuriuneak
 removeBlanks.header=Ezabatu orrialde zuriak
 removeBlanks.threshold=Gutxieneko balioa:
@@ -175,28 +488,38 @@ removeBlanks.whitePercent=Zuriaren protzentajea (%):
 removeBlanks.whitePercentDesc=Zuria izan behar den orriaren ehunekoa ezabatua izan dadin
 removeBlanks.submit=Ezabatu zuriuneak

+
+#compare
 compare.title=Konparatu
 compare.header=Konparatu PDF fitxategiak
 compare.document.1=1. dokumentua
 compare.document.2=2. dokumentua
 compare.submit=Konparatu

+
+#sign
 sign.title=Sinatu
 sign.header=Sinatu PDF fitxategiak
-sign.upload=Igo irudia 
-sign.draw=Marraztu sinadura 
+sign.upload=Igo irudia
+sign.draw=Marraztu sinadura
 sign.text=Testua sartzea
 sign.clear=Garbitu
 sign.add=Gehitu

+
+#repair
 repair.title=Konpondu
 repair.header=Konpondu PDF fitxategiak
 repair.submit=Konpondu

+
+#flatten
 flatten.title=Lautu
 flatten.header=Akoplatu PDF fitxategiak
 flatten.submit=Lautu

+
+#ScannerImageSplit
 ScannerImageSplit.selectText.1=Angeluaren gutxieneko balioa:
 ScannerImageSplit.selectText.2=Ezarri eskatutako gutxieneko angelu absolutua irudia biratzeko (lehenetsia: 10).
 ScannerImageSplit.selectText.3=Tolerantzia:
@@ -208,18 +531,6 @@ ScannerImageSplit.selectText.8=Ezarri inguruko arearen gutxieneko balioa argazki
 ScannerImageSplit.selectText.9=Ertzaren tamaina:
 ScannerImageSplit.selectText.10=Ezarri gehitutako eta ezabatutako ertzaren tamaina irteeran ertz zuriak saihesteko (lehenetsia: 1).

-navbar.settings=Ezarpenak
-settings.title=Ezarpenak
-settings.update=Eguneratze eskuragarria
-settings.appVersion=Aplikazioaren bertsioa:
-settings.downloadOption.title=Hautatu deskargatzeko aukera (fitxategi bakarra deskargatzeko ZIP gabe):
-settings.downloadOption.1=Ireki leiho berean
-settings.downloadOption.2=Ireki leiho berrian
-settings.downloadOption.3=Deskargatu fitxategia 
-settings.zipThreshold=ZIP fitxategiak deskargatutako fitxategi kopurua gainditzen denean
-
-
-                            
                            
 #OCR
 ocr.title=OCR / Garbiketa-eskaneatzea
@@ -241,7 +552,7 @@ ocr.credit=Zerbitzu honek OCRmyPDF eta OCR-rako Tesseract erabiltzen ditu
 ocr.submit=PDF prozesatu OCR-rekin


-
+#extractImages
 extractImages.title=Atera irudiak
 extractImages.header=Atera irudiak
 extractImages.selectText=Hautatu irudi-formatua ateratako irudiak bihurtzeko
@@ -269,8 +580,8 @@ compress.submit=Konprimatu


 #Add image
-addImage.title=Gehitu irudia 
-addImage.header=Gehitu PDF-irudia 
+addImage.title=Gehitu irudia
+addImage.header=Gehitu PDF-irudia
 addImage.everyPage=Orrialde guztiak?
 addImage.upload=Gehitu irudia
 addImage.submit=Gehitu irudia
@@ -279,36 +590,40 @@ addImage.submit=Gehitu irudia
 #merge
 merge.title=Elkartu
 merge.header=Elkartu zenbait PDF  (2+)
+merge.sortByName=Sort by name
+merge.sortByDate=Sort by date
 merge.submit=Elkartu

+
 #pdfOrganiser
 pdfOrganiser.title=Orrialdeen antolatzailea
 pdfOrganiser.header=PDF orrialdeen antolatzailea
-pdfOrganiser.submit=Antolatu orrialdeak 
+pdfOrganiser.submit=Antolatu orrialdeak

-#herramienta multiple
-multiTool.title= PDF erabilera anitzeko tresna
+
+#multiTool
+multiTool.title=PDF erabilera anitzeko tresna
 multiTool.header=PDF erabilera anitzeko tresna

+
 #pageRemover
 pageRemover.title=Orrialdeen ezabatzailea
 pageRemover.header=PDF orrialdeen ezabatzailea
 pageRemover.pagesToDelete=Ezabatu beharreko orrialdeak (sartu komaz bereizitako orrialde-zenbakien zerrenda):
-pageRemover.submit=Ezabatu orrialdeak 
+pageRemover.submit=Ezabatu orrialdeak
+

 #rotate
-rotate.title=Biratu PDFa 
-rotate.header=Biratu PDFa 
-rotate.SeleccionaAngle=Hautatu errotazio-angelua (90 graduren multiploa):
+rotate.title=Biratu PDFa
+rotate.header=Biratu PDFa
+rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
 rotate.submit=Biratu


-
-
 #merge
 split.title=Zatitu PDFa
 split.header=Zatitu PDFa
-split.desc.1=Hautatzen dituzun zenbakiak zatiketa egin nahi duzun orrialde-zenbakiak dira 
+split.desc.1=Hautatzen dituzun zenbakiak zatiketa egin nahi duzun orrialde-zenbakiak dira
 split.desc.2=Beraz, 1,3,7-8 hautatzean 10 orrialdeko dokumentua zatituko luke 6 PDF fitxategi bereizituetan
 split.desc.3=#1 Dokumentua: 1. orrialdea
 split.desc.4=#2 Dokumentua: 2. eta 3. orrialdeak
@@ -329,6 +644,7 @@ imageToPDF.selectText.2=PDFaren errotazio automatikoa
 imageToPDF.selectText.3=Fitxategi askoren logika (gaituta bakarrik zenbait irudirekin ari denean)
 imageToPDF.selectText.4=Elkartu PDF bakar batean
 imageToPDF.selectText.5=Bihurtu eta PDF bereizituak sortu
+    
                                   
 #pdfToImage
 pdfToImage.title=PDFa irudi bihurtu
@@ -343,6 +659,7 @@ pdfToImage.grey=Gris-eskala
 pdfToImage.blackwhite=Zuria eta Beltza (Datuak galdu ditzake!)
 pdfToImage.submit=Bihurtu

+
 #addPassword
 addPassword.title=Gehitu pasahitza
 addPassword.header=Gehitu pasahitza (enkriptatu)
@@ -361,9 +678,10 @@ addPassword.selectText.12=Galarazi inprimatzea
 addPassword.selectText.13=Galarazi zenbait formatu inprimatzea
 addPassword.selectText.14=Pasahitza
 addPassword.selectText.15=Mugatu zer egin daitekeen dokumentuarekin behin zabalduta (Irakurle guztiek onartu gabe)
-addPassword.selectText.16=Mugatu dokumentu bera zabaltzeko aukera 
+addPassword.selectText.16=Mugatu dokumentu bera zabaltzeko aukera
 addPassword.submit=Enkriptatu

+
 #watermark
 watermark.title=Gehitu ur-marka
 watermark.header=Gehitu ur-marka
@@ -374,14 +692,10 @@ watermark.selectText.4=Errotazioa (0-360):
 watermark.selectText.5=Zabalera (ur-marka bakoitzaren arteko espazioa horizontalean):
 watermark.selectText.6=Altuera (ur-marka bakoitzaren arteko espazioa bertikalean):
 watermark.selectText.7=Opakutasuna (0% - 100%):
+watermark.selectText.8=Watermark Type:
+watermark.selectText.9=Watermark Image:
 watermark.submit=Gehitu ur-marka

-#remove-watermark
-remove-watermark.title=Ezabatu ur-marka
-remove-watermark.header=Ezabatu ur-marka
-remove-watermark.selectText.1=Hautatu PDFa ur-marka ezabatzeko:
-remove-watermark.selectText.2=Ur-markaren testua:
-remove-watermark.submit=Ezabatu ur-marka

 #Change permissions
 permissions.title=Aldatu baimenak
@@ -399,6 +713,7 @@ permissions.selectText.9=Galarazi inprimatzea
 permissions.selectText.10=Galarazi zenbait formatu inprimatzea
 permissions.submit=Aldatu

+
 #remove password
 removePassword.title=Ezabatu pasahitza
 removePassword.header=Ezabatu pasahitza (desenkriptatu)
@@ -406,7 +721,9 @@ removePassword.selectText.1=Hautatu PDFa desenkriptatzeko
 removePassword.selectText.2=Pasahitza
 removePassword.submit=Ezabatu

-changeMetadata.title=Aldatu metadatuak
+
+#changeMetadata
+changeMetadata.title=Izenburua:
 changeMetadata.header=Aldatu metadatuak
 changeMetadata.selectText.1=Editatu aldatu nahi dituzun aldagaiak
 changeMetadata.selectText.2=Ezabatu metadatu guztiak
@@ -424,27 +741,30 @@ changeMetadata.selectText.4=Beste metadatu batzuk:
 changeMetadata.selectText.5=Gehitu metadatu pertsonalizatuen sarrera
 changeMetadata.submit=Aldatu

+
+#xlsToPdf
 xlsToPdf.title=Excela PDF bihurtu
 xlsToPdf.header=Excela PDF bihurtu
 xlsToPdf.selectText.1=Hautatu Excel XLSren edo XLSXren kalkulu-orria bihurtzeko
 xlsToPdf.convert=Bikurtu


-
-
+#pdfToPDFA
 pdfToPDFA.title=PDFa PDF/A bihurtu
 pdfToPDFA.header=PDFa PDF/A bihurtu
 pdfToPDFA.credit=Zerbitzu honek OCRmyPDF erabiltzen du PDFak PDF/A bihurtzeko
 pdfToPDFA.submit=Bihurtu


-
+#PDFToWord
 PDFToWord.title=PDFa Word bihurtu
 PDFToWord.header=PDFa Word bihurtu
 PDFToWord.selectText.1=Irteerako fitxategiaren formatua
 PDFToWord.credit=Zerbitzu honek LibreOffice erabiltzen du fitxategiak bihurtzeko
 PDFToWord.submit=Bihurtu

+
+#PDFToPresentation
 PDFToPresentation.title=PDFa aurkezpen bihurtu
 PDFToPresentation.header=PDFa aurkezpen bihurtu
 PDFToPresentation.selectText.1=Irteerako fitxategiaren formatua
@@ -452,6 +772,7 @@ PDFToPresentation.credit=Zerbitzu honek LibreOffice erabiltzen du fitxategiak bi
 PDFToPresentation.submit=Bihurtu


+#PDFToText
 PDFToText.title=PDFa TXT/RTF bihurtu
 PDFToText.header=PDFa TXT/RTF bihurtu
 PDFToText.selectText.1=Irteerako fitxategiaren formatua
@@ -459,12 +780,15 @@ PDFToText.credit=Zerbitzu honek LibreOffice erabiltzen du fitxategiak bihurtzeko
 PDFToText.submit=Bihurtu


+#PDFToHTML
 PDFToHTML.title=PDFa HTML bihurtu
 PDFToHTML.header=PDFa HTML bihurtu
 PDFToHTML.credit=Zerbitzu honek LibreOffice erabiltzen du fitxategiak bihurtzeko
 PDFToHTML.submit=Bihurtu

+
+#PDFToXML
 PDFToXML.title=PDFa XML bihurtu
 PDFToXML.header=PDFa XML bihurtu
 PDFToXML.credit=Zerbitzu honek LibreOffice erabiltzen du fitxategiak bihurtzeko
-PDFToXML.submit=Bihurtu
+PDFToXML.submit=Bihurtu
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Stirling	c57b308909	Merge pull request #327 from Frooodle/loginPage Login page tweaks	2023-08-28 10:19:23 +01:00
Anthony Stirling	6409274f83	language stuff	2023-08-28 10:17:02 +01:00
Anthony Stirling	bc534c12a5	login page lang changes	2023-08-28 00:49:14 +01:00
Anthony Stirling	b58fd2022a	docker version stuff	2023-08-27 19:58:20 +01:00
Anthony Stirling	d850d026ed	fixes	2023-08-27 17:02:12 +01:00
Anthony Stirling	83627686d4	Update releaseArtifacts.yml	2023-08-27 14:41:02 +01:00
Anthony Stirling	4e7d01c72c	Update releaseArtifacts.yml	2023-08-27 13:52:26 +01:00
Anthony Stirling	0f8ab20db7	Merge pull request #325 from Frooodle/testversions test dynamic security	2023-08-27 13:47:19 +01:00
Anthony Stirling	88cc90786d	testing github actions	2023-08-27 13:45:58 +01:00
Anthony Stirling	fb66717b43	docker file testing	2023-08-27 13:45:37 +01:00
Anthony Stirling	1d60433fcf	test	2023-08-27 11:59:08 +01:00
Anthony Stirling	0f3df6e92b	cleanup imports	2023-08-27 00:39:22 +01:00
Anthony Stirling	ca7c63c7d7	name changes	2023-08-27 00:38:17 +01:00
Anthony Stirling	135f9611df	hometext fix	2023-08-26 23:45:43 +01:00
Anthony Stirling	cfaaeebd4a	test	2023-08-26 23:33:35 +01:00
Anthony Stirling	09a0779180	Merge pull request #322 from Frooodle/bootstrap5_test Bootstrap5	2023-08-26 22:35:59 +01:00
Anthony Stirling	7f7d09bc85	Update README.md	2023-08-26 22:35:10 +01:00
Anthony Stirling	0c454a08dc	rename to settins.yml	2023-08-26 22:33:23 +01:00
Anthony Stirling	d749b63549	configs and app setup stuff	2023-08-26 17:30:49 +01:00
Anthony Stirling	2053a6950d	config template	2023-08-26 12:27:52 +01:00
Anthony Stirling	41bd801e0d	redact stuff, login page, lang and remember me	2023-08-25 23:39:18 +01:00
Anthony Stirling	cd0e1a3962	redact	2023-08-24 23:23:25 +01:00
Anthony Stirling	7c2f482b3b	minor changes	2023-08-22 23:44:38 +01:00
Anthony Stirling	7741d60afd	bootstrap 5	2023-08-22 23:03:21 +01:00
Anthony Stirling	8aac0c0327	bs5 more	2023-08-22 21:19:18 +01:00
Anthony Stirling	7c26c56210	test	2023-08-20 21:57:19 +01:00
Anthony Stirling	e88a780efe	lang	2023-08-19 17:00:34 +01:00
Anthony Stirling	363fb5dc02	Merge branch 'main' of git@github.com:Frooodle/Stirling-PDF.git into main	2023-08-19 16:59:52 +01:00
Anthony Stirling	39a187b6da	darkmode fix for account and pagenumber support filename	2023-08-19 16:59:34 +01:00
Anthony Stirling	b4cc34a522	Merge pull request #321 from appel/main Dutch translation	2023-08-19 14:41:06 +01:00
appel	af94ef3d49	Dutch translation	2023-08-19 09:25:28 -04:00
Anthony Stirling	505855a53c	Fix password updation	2023-08-19 12:50:49 +01:00
Anthony Stirling	87ac245341	Update sanitize-pdf.html	2023-08-19 12:26:43 +01:00
Anthony Stirling	1670a09d04	Update SanitizeController.java	2023-08-19 11:58:18 +01:00
Anthony Stirling	620b954336	Merge pull request #307 from Frooodle/login Login	2023-08-17 22:48:47 +01:00
Anthony Stirling	cfd51e9b84	Update build.gradle	2023-08-17 22:47:48 +01:00
Anthony Stirling	6c797f8216	fix readme	2023-08-17 22:45:59 +01:00
Anthony Stirling	40e208152a	translations	2023-08-17 22:26:35 +01:00
Anthony Stirling	cf7bfa62ef	Merge branch 'main' into login	2023-08-17 22:21:31 +01:00
Anthony Stirling	a1086b9a04	update todo	2023-08-17 22:21:14 +01:00
Anthony Stirling	9bc4bbd2c8	grammer	2023-08-17 22:20:50 +01:00
Anthony Stirling	73156012e9	security	2023-08-17 22:19:11 +01:00
Anthony Stirling	91cc3d77d4	readme stuff	2023-08-17 22:17:42 +01:00
Anthony Stirling	3fc55a9e9f	translations	2023-08-17 22:03:43 +01:00
Anthony Stirling	b666aa3f26	merge stuff #318	2023-08-17 22:03:36 +01:00
Anthony Stirling	53e7dbe12f	translates	2023-08-17 00:10:14 +01:00
Anthony Stirling	9d8ff6856b	Merge pull request #316 from deraw/update-fr-translations Update messages_fr_FR.properties	2023-08-15 08:26:28 +01:00
Dylan Broussard	3fb38376b0	Update messages_fr_FR.properties	2023-08-15 03:38:42 +02:00
Anthony Stirling	15c73d9dd3	Add files via upload	2023-08-15 00:40:22 +01:00
Anthony Stirling	86f71ffb93	change user and pass	2023-08-15 00:39:13 +01:00
Anthony Stirling	eb928d3369	Merge pull request #313 from deraw/deraw-fix-add-page-numbers Fix title in add-page-numbers.html	2023-08-15 00:02:28 +01:00
Anthony Stirling	d7307665b3	Fix title #313	2023-08-15 00:01:19 +01:00
Dylan Broussard	2836f0ab5a	Fix title in add-page-numbers.html The key `autoCrop.title` was used instead of `addPageNumbers.title`.	2023-08-15 00:29:36 +02:00
Anthony Stirling	91b7f3980c	Change account icons	2023-08-14 22:48:30 +01:00
Anthony Stirling	5053432c2d	pdf to image	2023-08-14 21:43:39 +01:00
Anthony Stirling	563c612395	remove pbean	2023-08-14 21:42:31 +01:00
Anthony Stirling	95dced6455	Merge branch 'login' of git@github.com:Frooodle/Stirling-PDF.git into login	2023-08-14 21:42:25 +01:00
Anthony Stirling	989f0bbbfb	caching	2023-08-14 21:41:42 +01:00
Anthony Stirling	e5eec28bfd	Delete mydatabase.trace.db	2023-08-13 22:49:23 +01:00
Anthony Stirling	bfc402f307	Delete mydatabase.mv.db	2023-08-13 22:49:15 +01:00
Anthony Stirling	35a998b934	Login	2023-08-13 22:46:18 +01:00
Anthony Stirling	cadc8e499d	IT WORKS almost	2023-08-13 18:19:15 +01:00
Anthony Stirling	7f7ea6da9f	APi key stuff	2023-08-13 10:53:00 +01:00
Anthony Stirling	ab9a22d8e7	Add files via upload	2023-08-13 01:15:26 +01:00
Anthony Stirling	cd2728105e	Add files via upload	2023-08-13 01:14:30 +01:00
Anthony Stirling	d75e84bdff	Create InitialSetup.java	2023-08-13 01:14:14 +01:00
Anthony Stirling	e791fee38b	security	2023-08-13 01:12:29 +01:00
Anthony Stirling	ad5f057733	Fix for #306	2023-08-12 19:53:14 +01:00
Anthony Stirling	6f325b5fdb	init	2023-08-12 02:29:10 +01:00
Anthony Stirling	b73aeee18d	Merge pull request #304 from adrielCarmoUFMS/adrielCarmoUFMS-patch-1-1 Update messages_pt_BR.properties	2023-08-11 16:25:14 +01:00
adrielCarmoUFMS	8a54035a9f	Update messages_pt_BR.properties Update messages_pt_BR.properties	2023-08-11 10:21:13 -04:00
adrielCarmoUFMS	af28e30e4c	Update messages_pt_BR.properties updating new properties for the pt-BR language	2023-08-11 09:23:04 -04:00
Anthony Stirling	492513306c	Merge pull request #303 from adrielCarmoUFMS/main update language pt-br	2023-08-10 21:45:27 +01:00
Anthony Stirling	bc554ff4a7	Merge branch 'main' into main	2023-08-10 21:42:40 +01:00
Anthony Stirling	b7a0d1ece8	Merge pull request #301 from jb2barrels/en_US_Aug-10-2023 Create en_US translation properties	2023-08-10 21:42:16 +01:00
Jacob Braun	ca384218dc	Add US to navbar.html and distinguish English selection GB and US Add US to navbar.html and distinguish English selection GB and US	2023-08-10 13:33:46 -07:00
Jacob Braun	e9550fd6b2	Add US svg Add US svg	2023-08-10 13:33:20 -07:00
Jacob Braun	232a305d51	Add additional spelling changes for US translations Add additional spelling changes for US translations	2023-08-10 13:27:56 -07:00
adrielCarmoUFMS	a6ab448eeb	Merge pull request #2 from adrielCarmoUFMS/adrielCarmoUFMS-patch-1 Update messages_pt_BR.properties	2023-08-10 16:14:22 -04:00
adrielCarmoUFMS	f9aa157c6c	Update messages_pt_BR.properties Updating the translation of new features to the Portuguese - BR language	2023-08-10 16:03:24 -04:00
adrielCarmoUFMS	b7df24acaa	Merge pull request #1 from adrielCarmoUFMS/adrielCarmoUFMS_pt-BR Update messages_pt_BR.properties	2023-08-10 15:57:59 -04:00
adrielCarmoUFMS	ad4ca1b2d7	Update messages_pt_BR.properties Updating the translation of new features to the Portuguese - BR language	2023-08-10 15:56:15 -04:00
Jacob Braun	c562d197e7	Create en_US translation properties Copied from en_GB. Fixed variables noFavourites and home.pdfOrganiser.title to use its US corrected spelling.	2023-08-10 08:56:27 -07:00
Anthony Stirling	83ba1899b7	metric filters	2023-08-09 20:30:19 +01:00
Anthony Stirling	3420adc7c9	security and apple icons	2023-08-09 20:30:07 +01:00
Anthony Stirling	fd39f28e46	Merge pull request #280 from Frooodle/dependabot/gradle/org.springframework.boot-spring-boot-starter-test-3.1.2 Bump org.springframework.boot:spring-boot-starter-test from 3.1.0 to 3.1.2	2023-08-08 20:29:23 +01:00
Anthony Stirling	710125852a	Merge branch 'main' into dependabot/gradle/org.springframework.boot-spring-boot-starter-test-3.1.2	2023-08-08 20:27:51 +01:00
Anthony Stirling	e8ec208390	Merge pull request #281 from Frooodle/dependabot/gradle/org.springframework.boot-spring-boot-starter-web-3.1.2 Bump org.springframework.boot:spring-boot-starter-web from 3.1.0 to 3.1.2	2023-08-08 20:27:23 +01:00
dependabot[bot]	4584562607	Bump org.springframework.boot:spring-boot-starter-test Bumps [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) from 3.1.0 to 3.1.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.0...v3.1.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-08 19:25:51 +00:00
dependabot[bot]	2c1412a088	Bump org.springframework.boot:spring-boot-starter-web Bumps [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) from 3.1.0 to 3.1.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.0...v3.1.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-08 19:25:50 +00:00
Anthony Stirling	0a65382979	Merge pull request #279 from Frooodle/dependabot/gradle/org.springframework.boot-3.1.2 Bump org.springframework.boot from 3.1.1 to 3.1.2	2023-08-08 20:25:32 +01:00
Anthony Stirling	4f404f66e5	Merge branch 'main' into dependabot/gradle/org.springframework.boot-3.1.2	2023-08-08 20:24:34 +01:00
Anthony Stirling	89505ada00	Merge pull request #273 from Frooodle/dependabot/gradle/io.spring.dependency-management-1.1.2 Bump io.spring.dependency-management from 1.1.0 to 1.1.2	2023-08-08 20:24:01 +01:00
dependabot[bot]	374a30ac5a	Bump org.springframework.boot from 3.1.1 to 3.1.2 Bumps [org.springframework.boot](https://github.com/spring-projects/spring-boot) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.1...v3.1.2) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-08 19:20:25 +00:00
Anthony Stirling	cee4ee4128	Merge branch 'main' into dependabot/gradle/io.spring.dependency-management-1.1.2	2023-08-08 20:19:47 +01:00
Anthony Stirling	58fc5e2ffa	Merge pull request #259 from Frooodle/dependabot/gradle/org.apache.pdfbox-pdfbox-2.0.29 Bump org.apache.pdfbox:pdfbox from 2.0.28 to 2.0.29	2023-08-08 20:19:27 +01:00
Anthony Stirling	951ea43f8b	Merge branch 'main' into dependabot/gradle/org.apache.pdfbox-pdfbox-2.0.29	2023-08-08 20:09:34 +01:00
Anthony Stirling	ca16ecef24	Create StartupApplicationListener.java	2023-08-08 20:09:05 +01:00
Anthony Stirling	bb025dc2a1	Merge branch 'main' into dependabot/gradle/org.apache.pdfbox-pdfbox-2.0.29	2023-08-08 19:57:32 +01:00
dependabot[bot]	d797169bd0	Bump io.spring.dependency-management from 1.1.0 to 1.1.2 Bumps [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) from 1.1.0 to 1.1.2. - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.0...v1.1.2) --- updated-dependencies: - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-08 18:56:05 +00:00
Anthony Stirling	891f9e2252	api changes	2023-08-08 19:55:18 +01:00
Anthony Stirling	4a579c00ce	docs	2023-08-06 22:14:37 +01:00
Anthony Stirling	9cb4d8e088	remove copy fonts from LITE	2023-08-06 21:58:55 +01:00
Anthony Stirling	5d3ee7755a	show js	2023-08-06 21:57:35 +01:00
Anthony Stirling	c047c46587	Merge branch 'main' of git@github.com:Frooodle/Stirling-PDF.git into main	2023-08-06 21:56:47 +01:00
Anthony Stirling	54f53be5b5	show javascript, bug fixes	2023-08-06 21:56:02 +01:00
Anthony Stirling	8bb9e5b22f	Update fileInput.js	2023-08-06 14:16:56 +01:00
Anthony Stirling	379791a326	Merge pull request #297 from Frooodle/allInfo new features	2023-08-06 13:11:51 +01:00
Anthony Stirling	38ec68b303	version bump	2023-08-06 13:09:42 +01:00
Anthony Stirling	a5095b04ad	lang	2023-08-06 13:02:15 +01:00
Anthony Stirling	a27ddb40be	navbar, blank page desc and drag drop append	2023-08-06 12:34:26 +01:00
Anthony Stirling	bc36be8a5e	Merge remote-tracking branch 'origin/main' into allInfo	2023-08-05 23:04:28 +01:00
Anthony Stirling	1e35556034	update	2023-08-05 23:03:49 +01:00
Anthony Stirling	882cd41d4b	Merge pull request #296 from jordyjordy/multitool-filedrag add fileInput widget to multiSelect	2023-08-05 17:03:46 +01:00
jordy	724fb4bf8f	add fileInput widget to multiSelect	2023-08-05 17:36:05 +02:00
Anthony Stirling	b07437dbfa	get info DONE!	2023-08-02 23:03:35 +01:00
Anthony Stirling	96f05cd518	get info changes	2023-08-02 22:49:43 +01:00
Anthony Stirling	77411e94a4	new features	2023-08-01 00:03:13 +01:00
Anthony Stirling	0da9c62ef8	all info	2023-07-30 21:56:09 +01:00
Anthony Stirling	52a7885f3c	all inf	2023-07-30 14:43:34 +01:00
Anthony Stirling	f98f089d63	More fixes for RequestPart mixing	2023-07-30 11:39:29 +01:00
Anthony Stirling	6b618f3abe	Watermark fixes	2023-07-30 11:31:46 +01:00
Anthony Stirling	0732ffa76e	Update README.md	2023-07-29 14:31:09 +01:00
Anthony Stirling	b5b4636e56	changes to script executor and init	2023-07-29 13:53:30 +01:00
Anthony Stirling	ca12d040e1	Merge pull request #289 from NeilJared/patch-1 ES translation updated	2023-07-27 21:19:12 +01:00
NeilJared	3388b9fafa	Merge branch 'main' into patch-1	2023-07-27 21:47:51 +02:00
NeilJared	954b36e14c	Merge pull request #1 from NeilJared/NeilJared-patch-1 Update messages_es_ES.properties	2023-07-27 21:21:37 +02:00
NeilJared	4d43814220	Update messages_es_ES.properties ES translation completed and updated to v.0.11.2	2023-07-27 21:20:30 +02:00
dependabot[bot]	f6262c82e1	Bump org.apache.pdfbox:pdfbox from 2.0.28 to 2.0.29 Bumps org.apache.pdfbox:pdfbox from 2.0.28 to 2.0.29. --- updated-dependencies: - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-07-26 21:09:07 +00:00
Anthony Stirling	7ead12922f	new page	2023-07-26 22:08:34 +01:00
Anthony Stirling	33a6a7869c	Further Fixes	2023-07-26 22:08:19 +01:00
Anthony Stirling	bf995f989c	fixes	2023-07-26 13:00:06 +01:00
NeilJared	21de6c6520	Update messages_es_ES.properties partial translation update, will continue by line 348	2023-07-26 12:17:20 +02:00
systo	c14aa6851e	Merge branch 'main' of git@github.com:Frooodle/Stirling-PDF.git into main	2023-07-25 23:36:32 +01:00
Anthony Stirling	8260eced2d	auto split cleanup	2023-07-25 23:36:19 +01:00
Anthony Stirling	d028465dc5	Update README.md	2023-07-25 21:21:43 +01:00
Anthony Stirling	29dab5e47d	numbers name	2023-07-25 00:01:20 +01:00
Anthony Stirling	9e655631b4	lang cleanup	2023-07-24 23:53:52 +01:00
Anthony Stirling	179c7b80bb	languages	2023-07-24 23:12:33 +01:00
Anthony Stirling	349bf29122	fix navbar not supporting other languages nicely size wise	2023-07-23 23:20:30 +01:00
Anthony Stirling	295357f12b	tags and searching	2023-07-23 23:05:02 +01:00
Anthony Stirling	940f8d999e	Update messages_en_GB.properties	2023-07-23 15:13:33 +01:00
Anthony Stirling	5605d53a5f	Update messages_en_GB.properties	2023-07-23 13:05:47 +01:00
Anthony Stirling	116d103119	html to pdf	2023-07-23 00:03:25 +01:00
Anthony Stirling	2fd8c643af	UI for html/url	2023-07-22 17:27:08 +01:00
Anthony Stirling	4367ae7934	html and url to pdf init	2023-07-22 16:57:40 +01:00
Anthony Stirling	749461334d	pdfjs worker changes and crop fix	2023-07-22 13:17:24 +01:00
Anthony Stirling	e83a027023	Merge pull request #266 from webysther/patch-1 Update HowToUseOCR.md	2023-07-19 23:35:20 +01:00
Anthony Stirling	1883b477a3	Merge branch 'main' into patch-1	2023-07-19 23:33:46 +01:00
Anthony Stirling	37e2cd40da	Merge pull request #276 from Frooodle/pipelineStuff Start of v0.11	2023-07-19 23:26:57 +01:00
Anthony Stirling	81a9329975	border to contrast	2023-07-19 23:23:08 +01:00
Anthony Stirling	0eb019fc3c	searchbar cleanups	2023-07-19 23:15:16 +01:00
Anthony Stirling	4129c75475	crop fix, auto split docs and UI and message	2023-07-19 22:11:59 +01:00
Anthony Stirling	3d66f03f58	hide pipeline	2023-07-18 22:09:48 +01:00
Anthony Stirling	7b83104fd6	fix for #275	2023-07-18 22:04:18 +01:00
Anthony Stirling	794aede27f	docs	2023-07-17 21:59:34 +01:00
Anthony Stirling	08eb39b206	divider examples	2023-07-16 23:52:09 +01:00
Anthony Stirling	2566c7f3d7	translations	2023-07-16 19:42:13 +01:00
Anthony Stirling	a8522bb3b5	GB pretty	2023-07-16 19:34:01 +01:00
Anthony Stirling	92b9142902	language cleanups and sanitize	2023-07-16 18:57:21 +01:00
Anthony Stirling	d07e3e6522	change add numbers grid and remove files from pipelines	2023-07-16 16:07:08 +01:00
Anthony Stirling	29aabdfba8	filter	2023-07-16 00:36:58 +01:00
Anthony Stirling	9af1b0cfdc	some more changes also broke pipeline a bit	2023-07-15 16:06:33 +01:00
Anthony Stirling	6e32c7fe85	auto split init	2023-07-15 11:39:10 +01:00
Anthony Stirling	ddf5915c6a	drag drop niceness	2023-07-13 22:03:23 +01:00
Anthony Stirling	cdbf1fa73a	watermark features	2023-07-12 23:27:36 +01:00
Anthony Stirling	5d926b022b	gitingore	2023-07-12 00:17:55 +01:00
Anthony Stirling	50bcca10e2	pipeline stuff	2023-07-12 00:17:44 +01:00
Webysther Sperandio	a5528c06ee	Update HowToUseOCR.md	2023-07-10 13:49:58 +02:00
Anthony Stirling	94526de04b	sign fix	2023-07-09 20:34:07 +01:00
Anthony Stirling	1ddf7abe6f	extra fonts plus dynamic fonts	2023-07-09 19:36:41 +01:00
Anthony Stirling	a742c1b034	stuff	2023-07-09 18:10:10 +01:00
Anthony Stirling	6e726ac2a6	lots of stuff and garbage code for automate to cleanup lots	2023-07-09 00:05:33 +01:00
Anthony Stirling	5877b40be5	adjust contrast!	2023-07-06 22:52:22 +01:00
Anthony Stirling	a3c7f5aa46	Search bar and adjust contrast	2023-07-05 22:21:43 +01:00
Anthony Stirling	4e28bf03bd	auto rename	2023-07-04 23:25:21 +01:00
Anthony Stirling	f92482d89e	page numbers and custom images	2023-07-04 21:45:35 +01:00
Anthony Stirling	3c54429fe0	Update README.md	2023-07-02 19:19:49 +01:00