Ensure Pixel gets disabled, PDF ToC support (#3659)

# Description of Changes

Please provide a summary of the changes, including:

- What was changed
- Why the change was made
- Any challenges encountered

Closes #(issue_number)

---

## Checklist

### General

- [ ] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have read the [Stirling-PDF Developer
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md)
(if applicable)
- [ ] I have read the [How to add new languages to
Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md)
(if applicable)
- [ ] I have performed a self-review of my own code
- [ ] My changes generate no new warnings

### Documentation

- [ ] I have updated relevant docs on [Stirling-PDF's doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
(if functionality has heavily changed)
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

### UI Changes (if applicable)

- [ ] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)

### Testing (if applicable)

- [ ] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.

---------

Co-authored-by: Dario Ghunney Ware <[email protected]>
Co-authored-by: Connor Yoh <[email protected]>
Co-authored-by: a <a>
Co-authored-by: Reece <[email protected]>

stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java

@@ -13,8 +13,6 @@ import java.util.Properties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -39,10 +37,6 @@ import stirling.software.common.util.UrlUtils;
             "stirling.software.SPDF",
             "stirling.software.common",
             "stirling.software.proprietary"
-        },
-        exclude = {
-            DataSourceAutoConfiguration.class,
-            DataSourceTransactionManagerAutoConfiguration.class
         })
 public class SPDFApplication {
 
@@ -208,17 +202,37 @@ public class SPDFApplication {
     }
 
     private static String[] getActiveProfile(String[] args) {
-        if (args == null) {
-            return new String[] {"default"};
-        }
-
-        for (String arg : args) {
-            if (arg.contains("spring.profiles.active")) {
-                return arg.substring(args[0].indexOf('=') + 1).split(", ");
+        // 1. Check for explicitly passed profiles
+        if (args != null) {
+            for (String arg : args) {
+                if (arg.startsWith("--spring.profiles.active=")) {
+                    String[] provided = arg.substring(arg.indexOf('=') + 1).split(",");
+                    if (provided.length > 0) {
+                        log.info("#######0000000000000###############################");
+                        return provided;
+                    }
+                }
             }
         }
+        log.info("######################################");
+        // 2. Detect if SecurityConfiguration is present on classpath
+        if (isClassPresent(
+                "stirling.software.proprietary.security.configuration.SecurityConfiguration")) {
+            log.info("security");
+            return new String[] {"security"};
+        } else {
+            log.info("default");
+            return new String[] {"default"};
+        }
+    }
 
-        return new String[] {"default"};
+    private static boolean isClassPresent(String className) {
+        try {
+            Class.forName(className, false, SPDFApplication.class.getClassLoader());
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 
     public static String getStaticBaseUrl() {

stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java

@@ -14,21 +14,21 @@ import jakarta.servlet.http.HttpServletResponse;
 public class CleanUrlInterceptor implements HandlerInterceptor {
 
     private static final List<String> ALLOWED_PARAMS =
-        Arrays.asList(
-            "lang",
-            "endpoint",
-            "endpoints",
-            "logout",
-            "error",
-            "errorOAuth",
-            "file",
-            "messageType",
-            "infoMessage");
+            Arrays.asList(
+                    "lang",
+                    "endpoint",
+                    "endpoints",
+                    "logout",
+                    "error",
+                    "errorOAuth",
+                    "file",
+                    "messageType",
+                    "infoMessage");
 
     @Override
     public boolean preHandle(
-        HttpServletRequest request, HttpServletResponse response, Object handler)
-        throws Exception {
+            HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
         String queryString = request.getQueryString();
         if (queryString != null && !queryString.isEmpty()) {
             String requestURI = request.getRequestURI();
@@ -69,15 +69,15 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
 
     @Override
     public void postHandle(
-        HttpServletRequest request,
-        HttpServletResponse response,
-        Object handler,
-        ModelAndView modelAndView) {}
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Object handler,
+            ModelAndView modelAndView) {}
 
     @Override
     public void afterCompletion(
-        HttpServletRequest request,
-        HttpServletResponse response,
-        Object handler,
-        Exception ex) {}
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Object handler,
+            Exception ex) {}
 }

stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java

@@ -39,14 +39,14 @@ public class EndpointInspector implements ApplicationListener<ContextRefreshedEv
     private void discoverEndpoints() {
         try {
             Map<String, RequestMappingHandlerMapping> mappings =
-                applicationContext.getBeansOfType(RequestMappingHandlerMapping.class);
+                    applicationContext.getBeansOfType(RequestMappingHandlerMapping.class);
 
             for (Map.Entry<String, RequestMappingHandlerMapping> entry : mappings.entrySet()) {
                 RequestMappingHandlerMapping mapping = entry.getValue();
                 Map<RequestMappingInfo, HandlerMethod> handlerMethods = mapping.getHandlerMethods();
 
                 for (Map.Entry<RequestMappingInfo, HandlerMethod> handlerEntry :
-                    handlerMethods.entrySet()) {
+                        handlerMethods.entrySet()) {
                     RequestMappingInfo mappingInfo = handlerEntry.getKey();
                     HandlerMethod handlerMethod = handlerEntry.getValue();
 
@@ -105,7 +105,7 @@ public class EndpointInspector implements ApplicationListener<ContextRefreshedEv
             String infoString = mappingInfo.toString();
             if (infoString.contains("{")) {
                 String patternsSection =
-                    infoString.substring(infoString.indexOf("{") + 1, infoString.indexOf("}"));
+                        infoString.substring(infoString.indexOf("{") + 1, infoString.indexOf("}"));
 
                 for (String pattern : patternsSection.split(",")) {
                     pattern = pattern.trim();

stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java

@@ -18,8 +18,8 @@ public class EndpointInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(
-        HttpServletRequest request, HttpServletResponse response, Object handler)
-        throws Exception {
+            HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
         String requestURI = request.getRequestURI();
         boolean isEnabled;
 

stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java

@@ -25,23 +25,23 @@ public class ExternalAppDepConfig {
     private final Map<String, List<String>> commandToGroupMapping;
 
     public ExternalAppDepConfig(
-        EndpointConfiguration endpointConfiguration, RuntimePathConfig runtimePathConfig) {
+            EndpointConfiguration endpointConfiguration, RuntimePathConfig runtimePathConfig) {
         this.endpointConfiguration = endpointConfiguration;
         weasyprintPath = runtimePathConfig.getWeasyPrintPath();
         unoconvPath = runtimePathConfig.getUnoConvertPath();
 
         commandToGroupMapping =
-            new HashMap<>() {
+                new HashMap<>() {
 
-                {
-                    put("soffice", List.of("LibreOffice"));
-                    put(weasyprintPath, List.of("Weasyprint"));
-                    put("pdftohtml", List.of("Pdftohtml"));
-                    put(unoconvPath, List.of("Unoconvert"));
-                    put("qpdf", List.of("qpdf"));
-                    put("tesseract", List.of("tesseract"));
-                }
-            };
+                    {
+                        put("soffice", List.of("LibreOffice"));
+                        put(weasyprintPath, List.of("Weasyprint"));
+                        put("pdftohtml", List.of("Pdftohtml"));
+                        put(unoconvPath, List.of("Unoconvert"));
+                        put("qpdf", List.of("qpdf"));
+                        put("tesseract", List.of("tesseract"));
+                    }
+                };
     }
 
     private boolean isCommandAvailable(String command) {
@@ -63,8 +63,8 @@ public class ExternalAppDepConfig {
 
     private List<String> getAffectedFeatures(String group) {
         return endpointConfiguration.getEndpointsForGroup(group).stream()
-            .map(endpoint -> formatEndpointAsFeature(endpoint))
-            .toList();
+                .map(endpoint -> formatEndpointAsFeature(endpoint))
+                .toList();
     }
 
     private String formatEndpointAsFeature(String endpoint) {
@@ -72,8 +72,8 @@ public class ExternalAppDepConfig {
         String feature = endpoint.replace("-", " ").replace("pdf", "PDF").replace("img", "image");
         // Split into words and capitalize each word
         return Arrays.stream(feature.split("\\s+"))
-            .map(word -> capitalizeWord(word))
-            .collect(Collectors.joining(" "));
+                .map(word -> capitalizeWord(word))
+                .collect(Collectors.joining(" "));
     }
 
     private String capitalizeWord(String word) {
@@ -95,12 +95,12 @@ public class ExternalAppDepConfig {
                     List<String> affectedFeatures = getAffectedFeatures(group);
                     endpointConfiguration.disableGroup(group);
                     log.warn(
-                        "Missing dependency: {} - Disabling group: {} (Affected features: {})",
-                        command,
-                        group,
-                        affectedFeatures != null && !affectedFeatures.isEmpty()
-                            ? String.join(", ", affectedFeatures)
-                            : "unknown");
+                            "Missing dependency: {} - Disabling group: {} (Affected features: {})",
+                            command,
+                            group,
+                            affectedFeatures != null && !affectedFeatures.isEmpty()
+                                    ? String.join(", ", affectedFeatures)
+                                    : "unknown");
                 }
             }
         }
@@ -123,9 +123,9 @@ public class ExternalAppDepConfig {
             endpointConfiguration.disableGroup("Python");
             endpointConfiguration.disableGroup("OpenCV");
             log.warn(
-                "Missing dependency: Python - Disabling Python features: {} and OpenCV features: {}",
-                String.join(", ", pythonFeatures),
-                String.join(", ", openCVFeatures));
+                    "Missing dependency: Python - Disabling Python features: {} and OpenCV features: {}",
+                    String.join(", ", pythonFeatures),
+                    String.join(", ", openCVFeatures));
         } else {
             // If Python is available, check for OpenCV
             try {
@@ -141,16 +141,16 @@ public class ExternalAppDepConfig {
                     List<String> openCVFeatures = getAffectedFeatures("OpenCV");
                     endpointConfiguration.disableGroup("OpenCV");
                     log.warn(
-                        "OpenCV not available in Python - Disabling OpenCV features: {}",
-                        String.join(", ", openCVFeatures));
+                            "OpenCV not available in Python - Disabling OpenCV features: {}",
+                            String.join(", ", openCVFeatures));
                 }
             } catch (Exception e) {
                 List<String> openCVFeatures = getAffectedFeatures("OpenCV");
                 endpointConfiguration.disableGroup("OpenCV");
                 log.warn(
-                    "Error checking OpenCV: {} - Disabling OpenCV features: {}",
-                    e.getMessage(),
-                    String.join(", ", openCVFeatures));
+                        "Error checking OpenCV: {} - Disabling OpenCV features: {}",
+                        e.getMessage(),
+                        String.join(", ", openCVFeatures));
             }
         }
         endpointConfiguration.logDisabledEndpointsSummary();

stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java

@@ -25,9 +25,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
         // Handler for external static resources
         registry.addResourceHandler("/**")
                 .addResourceLocations(
-                    "file:" + InstallationPathConfig.getStaticPath(),
-                    "classpath:/static/"
-                );
+                        "file:" + InstallationPathConfig.getStaticPath(), "classpath:/static/");
         registry.addResourceHandler("/js/**").addResourceLocations("classpath:/static/js/");
         registry.addResourceHandler("/css/**").addResourceLocations("classpath:/static/css/");
         // .setCachePeriod(0); // Optional: disable caching

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java

@@ -0,0 +1,266 @@
+package stirling.software.SPDF.controller.api;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineNode;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/general")
+@Slf4j
+@Tag(name = "General", description = "General APIs")
+@RequiredArgsConstructor
+public class EditTableOfContentsController {
+
+    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final ObjectMapper objectMapper;
+
+    @PostMapping(value = "/extract-bookmarks", consumes = "multipart/form-data")
+    @Operation(
+            summary = "Extract PDF Bookmarks",
+            description = "Extracts bookmarks/table of contents from a PDF document as JSON.")
+    @ResponseBody
+    public List<Map<String, Object>> extractBookmarks(@RequestParam("file") MultipartFile file)
+            throws Exception {
+        PDDocument document = null;
+        try {
+            document = pdfDocumentFactory.load(file);
+            PDDocumentOutline outline = document.getDocumentCatalog().getDocumentOutline();
+
+            if (outline == null) {
+                log.info("No outline/bookmarks found in PDF");
+                return new ArrayList<>();
+            }
+
+            return extractBookmarkItems(document, outline);
+        } finally {
+            if (document != null) {
+                document.close();
+            }
+        }
+    }
+
+    private List<Map<String, Object>> extractBookmarkItems(
+            PDDocument document, PDDocumentOutline outline) throws Exception {
+        List<Map<String, Object>> bookmarks = new ArrayList<>();
+        PDOutlineItem current = outline.getFirstChild();
+
+        while (current != null) {
+            Map<String, Object> bookmark = new HashMap<>();
+
+            // Get bookmark title
+            String title = current.getTitle();
+            bookmark.put("title", title);
+
+            // Get page number (1-based for UI purposes)
+            PDPage page = current.findDestinationPage(document);
+            if (page != null) {
+                int pageIndex = document.getPages().indexOf(page);
+                bookmark.put("pageNumber", pageIndex + 1);
+            } else {
+                bookmark.put("pageNumber", 1);
+            }
+
+            // Process children if any
+            PDOutlineItem child = current.getFirstChild();
+            if (child != null) {
+                List<Map<String, Object>> children = new ArrayList<>();
+                PDOutlineNode parent = current;
+
+                while (child != null) {
+                    // Recursively process child items
+                    Map<String, Object> childBookmark = processChild(document, child);
+                    children.add(childBookmark);
+                    child = child.getNextSibling();
+                }
+
+                bookmark.put("children", children);
+            } else {
+                bookmark.put("children", new ArrayList<>());
+            }
+
+            bookmarks.add(bookmark);
+            current = current.getNextSibling();
+        }
+
+        return bookmarks;
+    }
+
+    private Map<String, Object> processChild(PDDocument document, PDOutlineItem item)
+            throws Exception {
+        Map<String, Object> bookmark = new HashMap<>();
+
+        // Get bookmark title
+        String title = item.getTitle();
+        bookmark.put("title", title);
+
+        // Get page number (1-based for UI purposes)
+        PDPage page = item.findDestinationPage(document);
+        if (page != null) {
+            int pageIndex = document.getPages().indexOf(page);
+            bookmark.put("pageNumber", pageIndex + 1);
+        } else {
+            bookmark.put("pageNumber", 1);
+        }
+
+        // Process children if any
+        PDOutlineItem child = item.getFirstChild();
+        if (child != null) {
+            List<Map<String, Object>> children = new ArrayList<>();
+
+            while (child != null) {
+                // Recursively process child items
+                Map<String, Object> childBookmark = processChild(document, child);
+                children.add(childBookmark);
+                child = child.getNextSibling();
+            }
+
+            bookmark.put("children", children);
+        } else {
+            bookmark.put("children", new ArrayList<>());
+        }
+
+        return bookmark;
+    }
+
+    @PostMapping(value = "/edit-table-of-contents", consumes = "multipart/form-data")
+    @Operation(
+            summary = "Edit Table of Contents",
+            description = "Add or edit bookmarks/table of contents in a PDF document.")
+    public ResponseEntity<byte[]> editTableOfContents(
+            @ModelAttribute EditTableOfContentsRequest request) throws Exception {
+        MultipartFile file = request.getFileInput();
+        PDDocument document = null;
+
+        try {
+            document = pdfDocumentFactory.load(file);
+
+            // Parse the bookmark data from JSON
+            List<BookmarkItem> bookmarks =
+                    objectMapper.readValue(
+                            request.getBookmarkData(), new TypeReference<List<BookmarkItem>>() {});
+
+            // Create a new document outline
+            PDDocumentOutline outline = new PDDocumentOutline();
+            document.getDocumentCatalog().setDocumentOutline(outline);
+
+            // Add bookmarks to the outline
+            addBookmarksToOutline(document, outline, bookmarks);
+
+            // Save the document to a byte array
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            document.save(baos);
+
+            String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
+            return WebResponseUtils.bytesToWebResponse(
+                    baos.toByteArray(), filename + "_with_toc.pdf", MediaType.APPLICATION_PDF);
+
+        } finally {
+            if (document != null) {
+                document.close();
+            }
+        }
+    }
+
+    private void addBookmarksToOutline(
+            PDDocument document, PDDocumentOutline outline, List<BookmarkItem> bookmarks) {
+        for (BookmarkItem bookmark : bookmarks) {
+            PDOutlineItem item = createOutlineItem(document, bookmark);
+            outline.addLast(item);
+
+            if (bookmark.getChildren() != null && !bookmark.getChildren().isEmpty()) {
+                addChildBookmarks(document, item, bookmark.getChildren());
+            }
+        }
+    }
+
+    private void addChildBookmarks(
+            PDDocument document, PDOutlineItem parent, List<BookmarkItem> children) {
+        for (BookmarkItem child : children) {
+            PDOutlineItem item = createOutlineItem(document, child);
+            parent.addLast(item);
+
+            if (child.getChildren() != null && !child.getChildren().isEmpty()) {
+                addChildBookmarks(document, item, child.getChildren());
+            }
+        }
+    }
+
+    private PDOutlineItem createOutlineItem(PDDocument document, BookmarkItem bookmark) {
+        PDOutlineItem item = new PDOutlineItem();
+        item.setTitle(bookmark.getTitle());
+
+        // Get the target page - adjust for 0-indexed pages in PDFBox
+        int pageIndex = bookmark.getPageNumber() - 1;
+        if (pageIndex < 0) {
+            pageIndex = 0;
+        } else if (pageIndex >= document.getNumberOfPages()) {
+            pageIndex = document.getNumberOfPages() - 1;
+        }
+
+        PDPage page = document.getPage(pageIndex);
+        item.setDestination(page);
+
+        return item;
+    }
+
+    // Inner class to represent bookmarks in JSON
+    public static class BookmarkItem {
+        private String title;
+        private int pageNumber;
+        private List<BookmarkItem> children = new ArrayList<>();
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public int getPageNumber() {
+            return pageNumber;
+        }
+
+        public void setPageNumber(int pageNumber) {
+            this.pageNumber = pageNumber;
+        }
+
+        public List<BookmarkItem> getChildren() {
+            return children;
+        }
+
+        public void setChildren(List<BookmarkItem> children) {
+            this.children = children;
+        }
+    }
+}

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -15,6 +15,8 @@ import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
@@ -110,6 +112,46 @@ public class MergeController {
         }
     }
 
+    // Adds a table of contents to the merged document using filenames as chapter titles
+    private void addTableOfContents(PDDocument mergedDocument, MultipartFile[] files) {
+        // Create the document outline
+        PDDocumentOutline outline = new PDDocumentOutline();
+        mergedDocument.getDocumentCatalog().setDocumentOutline(outline);
+
+        int pageIndex = 0; // Current page index in the merged document
+
+        // Iterate through the original files
+        for (MultipartFile file : files) {
+            // Get the filename without extension to use as bookmark title
+            String filename = file.getOriginalFilename();
+            String title = filename;
+            if (title != null && title.contains(".")) {
+                title = title.substring(0, title.lastIndexOf('.'));
+            }
+
+            // Create an outline item for this file
+            PDOutlineItem item = new PDOutlineItem();
+            item.setTitle(title);
+
+            // Set the destination to the first page of this file in the merged document
+            if (pageIndex < mergedDocument.getNumberOfPages()) {
+                PDPage page = mergedDocument.getPage(pageIndex);
+                item.setDestination(page);
+            }
+
+            // Add the item to the outline
+            outline.addLast(item);
+
+            // Increment page index for the next file
+            try (PDDocument doc = pdfDocumentFactory.load(file)) {
+                pageIndex += doc.getNumberOfPages();
+            } catch (IOException e) {
+                log.error("Error loading document for TOC generation", e);
+                pageIndex++; // Increment by at least one if we can't determine page count
+            }
+        }
+    }
+
     @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
     @Operation(
             summary = "Merge multiple PDF files into one",
@@ -124,6 +166,7 @@ public class MergeController {
         PDDocument mergedDocument = null;
 
         boolean removeCertSign = Boolean.TRUE.equals(request.getRemoveCertSign());
+        boolean generateToc = request.isGenerateToc();
 
         try {
             MultipartFile[] files = request.getFileInput();
@@ -170,6 +213,11 @@ public class MergeController {
                 }
             }
 
+            // Add table of contents if generateToc is true
+            if (generateToc && files.length > 0) {
+                addTableOfContents(mergedDocument, files);
+            }
+
             // Save the modified document to a new ByteArrayOutputStream
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             mergedDocument.save(baos);

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java

@@ -36,9 +36,9 @@ public class SettingsController {
     public ResponseEntity<String> updateApiKey(@RequestBody Boolean enabled) throws IOException {
         if (applicationProperties.getSystem().getEnableAnalytics() != null) {
             return ResponseEntity.status(HttpStatus.ALREADY_REPORTED)
-                .body(
-                    "Setting has already been set, To adjust please edit "
-                        + InstallationPathConfig.getSettingsPath());
+                    .body(
+                            "Setting has already been set, To adjust please edit "
+                                    + InstallationPathConfig.getSettingsPath());
         }
         GeneralUtils.saveKeyToSettings("system.enableAnalytics", enabled);
         applicationProperties.getSystem().setEnableAnalytics(enabled);

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -27,9 +27,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
-import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @RestController
 @RequestMapping("/api/v1/general")

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java

@@ -31,11 +31,11 @@ import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 import stirling.software.common.model.PdfMetadata;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.service.PdfMetadataService;
 import stirling.software.common.util.WebResponseUtils;
-import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 
 @RestController
 @RequestMapping("/api/v1/general")

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -31,9 +31,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
-import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
 
 @RestController
 @RequestMapping("/api/v1/general")

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java

@@ -16,8 +16,10 @@ import org.springframework.web.multipart.MultipartFile;
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -39,9 +41,9 @@ public class ConvertEmlToPDF {
             summary = "Convert EML to PDF",
             description =
                     "This endpoint converts EML (email) files to PDF format with extensive"
-                        + " customization options. Features include font settings, image constraints, display modes, attachment handling,"
-                        + " and HTML debug output. Input: EML file, Output: PDF"
-                        + " or HTML file. Type: SISO")
+                            + " customization options. Features include font settings, image constraints, display modes, attachment handling,"
+                            + " and HTML debug output. Input: EML file, Output: PDF"
+                            + " or HTML file. Type: SISO")
     public ResponseEntity<byte[]> convertEmlToPdf(@ModelAttribute EmlToPdfRequest request) {
 
         MultipartFile inputFile = request.getFileInput();
@@ -94,7 +96,8 @@ public class ConvertEmlToPDF {
             try {
                 byte[] pdfBytes =
                         EmlToPdf.convertEmlToPdf(
-                                runtimePathConfig.getWeasyPrintPath(), // Use configured WeasyPrint path
+                                runtimePathConfig
+                                        .getWeasyPrintPath(), // Use configured WeasyPrint path
                                 request,
                                 fileBytes,
                                 originalFilename,
@@ -119,12 +122,20 @@ public class ConvertEmlToPDF {
                         .body("Conversion was interrupted".getBytes(StandardCharsets.UTF_8));
             } catch (IllegalArgumentException e) {
                 String errorMessage = buildErrorMessage(e, originalFilename);
-                log.error("EML to PDF conversion failed for {}: {}", originalFilename, errorMessage, e);
+                log.error(
+                        "EML to PDF conversion failed for {}: {}",
+                        originalFilename,
+                        errorMessage,
+                        e);
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                         .body(errorMessage.getBytes(StandardCharsets.UTF_8));
             } catch (RuntimeException e) {
                 String errorMessage = buildErrorMessage(e, originalFilename);
-                log.error("EML to PDF conversion failed for {}: {}", originalFilename, errorMessage, e);
+                log.error(
+                        "EML to PDF conversion failed for {}: {}",
+                        originalFilename,
+                        errorMessage,
+                        e);
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                         .body(errorMessage.getBytes(StandardCharsets.UTF_8));
             }

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java

@@ -23,9 +23,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.FileToPdf;
 import stirling.software.common.util.WebResponseUtils;

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -1,8 +1,5 @@
 package stirling.software.SPDF.controller.api.misc;
 
-import io.github.pixee.security.Filenames;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -20,17 +17,14 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
 import javax.imageio.stream.ImageOutputStream;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -44,6 +38,17 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -36,8 +36,8 @@ import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
 import stirling.software.SPDF.service.ApiDocService;
-import stirling.software.common.service.PostHogService;
 import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.service.PostHogService;
 import stirling.software.common.util.FileMonitor;
 
 @Service

stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -184,7 +184,8 @@ public class RedactController {
         String pageNumbersInput = request.getPageNumbers();
         String[] parsedPageNumbers =
                 pageNumbersInput != null ? pageNumbersInput.split(",") : new String[0];
-        List<Integer> pageNumbers = GeneralUtils.parsePageList(parsedPageNumbers, pagesCount, false);
+        List<Integer> pageNumbers =
+                GeneralUtils.parsePageList(parsedPageNumbers, pagesCount, false);
         Collections.sort(pageNumbers);
         return pageNumbers;
     }

stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -7,6 +7,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import stirling.software.common.util.CheckProgramInstall;
 
 @Controller

stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -130,6 +130,13 @@ public class GeneralWebController {
         return "view-pdf";
     }
 
+    @GetMapping("/edit-table-of-contents")
+    @Hidden
+    public String editTableOfContents(Model model) {
+        model.addAttribute("currentPage", "edit-table-of-contents");
+        return "edit-table-of-contents";
+    }
+
     @GetMapping("/multi-tool")
     @Hidden
     public String multiToolForm(Model model) {

stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -22,8 +22,8 @@ import io.swagger.v3.oas.annotations.Hidden;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.model.ApplicationProperties;
 import stirling.software.SPDF.model.Dependency;
+import stirling.software.common.model.ApplicationProperties;
 
 @Slf4j
 @Controller
@@ -48,9 +48,7 @@ public class HomeWebController {
             InputStream is = resource.getInputStream();
             String json = new String(is.readAllBytes(), StandardCharsets.UTF_8);
             ObjectMapper mapper = new ObjectMapper();
-            Map<String, List<Dependency>> data =
-                mapper.readValue(json, new TypeReference<>() {
-                });
+            Map<String, List<Dependency>> data = mapper.readValue(json, new TypeReference<>() {});
             model.addAttribute("dependencies", data.get("dependencies"));
         } catch (IOException e) {
             log.error("exception", e);

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java

@@ -0,0 +1,24 @@
+package stirling.software.SPDF.model.api;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import stirling.software.common.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EditTableOfContentsRequest extends PDFFile {
+
+    @Schema(
+            description = "Bookmark structure in JSON format",
+            example =
+                    "[{\"title\":\"Chapter 1\",\"pageNumber\":1,\"children\":[{\"title\":\"Section 1.1\",\"pageNumber\":2}]}]")
+    private String bookmarkData;
+
+    @Schema(
+            description = "Whether to replace existing bookmarks or append to them",
+            example = "true")
+    private Boolean replaceExisting;
+}

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;
 
 @Data

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;
 
 @Data

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 
 @Data
@@ -11,31 +12,31 @@ import stirling.software.SPDF.model.api.PDFWithPageNums;
 public class ConvertToImageRequest extends PDFWithPageNums {
 
     @Schema(
-        description = "The output image format",
-        defaultValue = "png",
-        allowableValues = {"png", "jpeg", "jpg", "gif", "webp"},
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The output image format",
+            defaultValue = "png",
+            allowableValues = {"png", "jpeg", "jpg", "gif", "webp"},
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String imageFormat;
 
     @Schema(
-        description =
-            "Choose between a single image containing all pages or separate images for each"
-                + " page",
-        defaultValue = "multiple",
-        allowableValues = {"single", "multiple"},
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "Choose between a single image containing all pages or separate images for each"
+                            + " page",
+            defaultValue = "multiple",
+            allowableValues = {"single", "multiple"},
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String singleOrMultiple;
 
     @Schema(
-        description = "The color type of the output image(s)",
-        defaultValue = "color",
-        allowableValues = {"color", "greyscale", "blackwhite"},
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The color type of the output image(s)",
+            defaultValue = "color",
+            allowableValues = {"color", "greyscale", "blackwhite"},
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String colorType;
 
     @Schema(
-        description = "The DPI (dots per inch) for the output image(s)",
-        defaultValue = "300",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The DPI (dots per inch) for the output image(s)",
+            defaultValue = "300",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer dpi;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java

@@ -12,8 +12,8 @@ import stirling.software.SPDF.model.api.PDFWithPageNums;
 public class ContainsTextRequest extends PDFWithPageNums {
 
     @Schema(
-        description = "The text to check for",
-        defaultValue = "text",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The text to check for",
+            defaultValue = "text",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String text;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java

@@ -12,8 +12,8 @@ import stirling.software.SPDF.model.api.PDFComparison;
 public class FileSizeRequest extends PDFComparison {
 
     @Schema(
-        description = "Size of the file in bytes",
-        requiredMode = Schema.RequiredMode.REQUIRED,
-        defaultValue = "0")
+            description = "Size of the file in bytes",
+            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "0")
     private long fileSize;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java

@@ -12,8 +12,8 @@ import stirling.software.SPDF.model.api.PDFComparison;
 public class PageRotationRequest extends PDFComparison {
 
     @Schema(
-        description = "Rotation in degrees",
-        requiredMode = Schema.RequiredMode.REQUIRED,
-        defaultValue = "0")
+            description = "Rotation in degrees",
+            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "0")
     private int rotation;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java

@@ -12,9 +12,9 @@ import stirling.software.SPDF.model.api.PDFComparison;
 public class PageSizeRequest extends PDFComparison {
 
     @Schema(
-        description = "Standard Page Size",
-        allowableValues = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "LETTER", "LEGAL"},
-        defaultValue = "A4",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Standard Page Size",
+            allowableValues = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "LETTER", "LEGAL"},
+            defaultValue = "A4",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String standardPageSize;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java

@@ -32,4 +32,11 @@ public class MergePdfsRequest extends MultiplePDFFiles {
             requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "true")
     private Boolean removeCertSign;
+
+    @Schema(
+            description =
+                    "Flag indicating whether to generate a table of contents for the merged PDF. If true, a table of contents will be created using the input filenames as chapter names.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "false")
+    private boolean generateToc = false;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java

@@ -14,33 +14,33 @@ import stirling.software.common.model.api.PDFFile;
 public class OverlayPdfsRequest extends PDFFile {
 
     @Schema(
-        description =
-            "An array of PDF files to be used as overlays on the base PDF. The order in"
-                + " these files is applied based on the selected mode.",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "An array of PDF files to be used as overlays on the base PDF. The order in"
+                            + " these files is applied based on the selected mode.",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private MultipartFile[] overlayFiles;
 
     @Schema(
-        description =
-            "The mode of overlaying: 'SequentialOverlay' for sequential application,"
-                + " 'InterleavedOverlay' for round-robin application, 'FixedRepeatOverlay'"
-                + " for fixed repetition based on provided counts",
-        allowableValues = {"SequentialOverlay", "InterleavedOverlay", "FixedRepeatOverlay"},
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "The mode of overlaying: 'SequentialOverlay' for sequential application,"
+                            + " 'InterleavedOverlay' for round-robin application, 'FixedRepeatOverlay'"
+                            + " for fixed repetition based on provided counts",
+            allowableValues = {"SequentialOverlay", "InterleavedOverlay", "FixedRepeatOverlay"},
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String overlayMode;
 
     @Schema(
-        description =
-            "An array of integers specifying the number of times each corresponding overlay"
-                + " file should be applied in the 'FixedRepeatOverlay' mode. This should"
-                + " match the length of the overlayFiles array.",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description =
+                    "An array of integers specifying the number of times each corresponding overlay"
+                            + " file should be applied in the 'FixedRepeatOverlay' mode. This should"
+                            + " match the length of the overlayFiles array.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private int[] counts;
 
     @Schema(
-        description = "Overlay position 0 is Foregound, 1 is Background",
-        allowableValues = {"0", "1"},
-        requiredMode = Schema.RequiredMode.REQUIRED,
-        type = "number")
+            description = "Overlay position 0 is Foregound, 1 is Background",
+            allowableValues = {"0", "1"},
+            requiredMode = Schema.RequiredMode.REQUIRED,
+            type = "number")
     private int overlayPosition;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java

@@ -14,9 +14,9 @@ import stirling.software.SPDF.model.api.PDFWithPageNums;
 public class AddStampRequest extends PDFWithPageNums {
 
     @Schema(
-        description = "The stamp type (text or image)",
-        allowableValues = {"text", "image"},
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The stamp type (text or image)",
+            allowableValues = {"text", "image"},
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String stampType;
 
     @Schema(description = "The stamp text", defaultValue = "Stirling Software")
@@ -26,60 +26,60 @@ public class AddStampRequest extends PDFWithPageNums {
     private MultipartFile stampImage;
 
     @Schema(
-        description = "The selected alphabet of the stamp text",
-        allowableValues = {"roman", "arabic", "japanese", "korean", "chinese"},
-        defaultValue = "roman")
+            description = "The selected alphabet of the stamp text",
+            allowableValues = {"roman", "arabic", "japanese", "korean", "chinese"},
+            defaultValue = "roman")
     private String alphabet = "roman";
 
     @Schema(
-        description = "The font size of the stamp text and image",
-        defaultValue = "30",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The font size of the stamp text and image",
+            defaultValue = "30",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float fontSize;
 
     @Schema(
-        description = "The rotation of the stamp in degrees",
-        defaultValue = "0",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The rotation of the stamp in degrees",
+            defaultValue = "0",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float rotation;
 
     @Schema(
-        description = "The opacity of the stamp (0.0 - 1.0)",
-        defaultValue = "0.5",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The opacity of the stamp (0.0 - 1.0)",
+            defaultValue = "0.5",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float opacity;
 
     @Schema(
-        description =
-            "Position for stamp placement based on a 1-9 grid (1: bottom-left, 2: bottom-center,"
-                + " 3: bottom-right, 4: middle-left, 5: middle-center, 6: middle-right,"
-                + " 7: top-left, 8: top-center, 9: top-right)",
-        allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9"},
-        defaultValue = "5",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "Position for stamp placement based on a 1-9 grid (1: bottom-left, 2: bottom-center,"
+                            + " 3: bottom-right, 4: middle-left, 5: middle-center, 6: middle-right,"
+                            + " 7: top-left, 8: top-center, 9: top-right)",
+            allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9"},
+            defaultValue = "5",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private int position;
 
     @Schema(
-        description =
-            "Override X coordinate for stamp placement. If set, it will override the"
-                + " position-based calculation. Negative value means no override.",
-        defaultValue = "-1",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "Override X coordinate for stamp placement. If set, it will override the"
+                            + " position-based calculation. Negative value means no override.",
+            defaultValue = "-1",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float overrideX; // Default to -1 indicating no override
 
     @Schema(
-        description =
-            "Override Y coordinate for stamp placement. If set, it will override the"
-                + " position-based calculation. Negative value means no override.",
-        defaultValue = "-1",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description =
+                    "Override Y coordinate for stamp placement. If set, it will override the"
+                            + " position-based calculation. Negative value means no override.",
+            defaultValue = "-1",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float overrideY; // Default to -1 indicating no override
 
     @Schema(
-        description = "Specifies the margin size for the stamp.",
-        allowableValues = {"small", "medium", "large", "x-large"},
-        defaultValue = "medium",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Specifies the margin size for the stamp.",
+            allowableValues = {"small", "medium", "large", "x-large"},
+            defaultValue = "medium",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String customMargin;
 
     @Schema(description = "The color of the stamp text", defaultValue = "#d3d3d3")

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java

@@ -14,71 +14,71 @@ import stirling.software.common.model.api.PDFFile;
 public class MetadataRequest extends PDFFile {
 
     @Schema(
-        description = "Delete all metadata if set to true",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Delete all metadata if set to true",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean deleteAll;
 
     @Schema(
-        description = "The author of the document",
-        defaultValue = "author",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The author of the document",
+            defaultValue = "author",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String author;
 
     @Schema(
-        description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)",
-        pattern = "yyyy/MM/dd HH:mm:ss",
-        defaultValue = "2023/10/01 12:00:00",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)",
+            pattern = "yyyy/MM/dd HH:mm:ss",
+            defaultValue = "2023/10/01 12:00:00",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String creationDate;
 
     @Schema(
-        description = "The creator of the document",
-        defaultValue = "creator",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The creator of the document",
+            defaultValue = "creator",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String creator;
 
     @Schema(
-        description = "The keywords for the document",
-        defaultValue = "keywords",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The keywords for the document",
+            defaultValue = "keywords",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String keywords;
 
     @Schema(
-        description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)",
-        pattern = "yyyy/MM/dd HH:mm:ss",
-        defaultValue = "2023/10/01 12:00:00",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)",
+            pattern = "yyyy/MM/dd HH:mm:ss",
+            defaultValue = "2023/10/01 12:00:00",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String modificationDate;
 
     @Schema(
-        description = "The producer of the document",
-        defaultValue = "producer",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The producer of the document",
+            defaultValue = "producer",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String producer;
 
     @Schema(
-        description = "The subject of the document",
-        defaultValue = "subject",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The subject of the document",
+            defaultValue = "subject",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String subject;
 
     @Schema(
-        description = "The title of the document",
-        defaultValue = "title",
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The title of the document",
+            defaultValue = "title",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String title;
 
     @Schema(
-        description = "The trapped status of the document",
-        defaultValue = "False",
-        allowableValues = {"True", "False", "Unknown"},
-        requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+            description = "The trapped status of the document",
+            defaultValue = "False",
+            allowableValues = {"True", "False", "Unknown"},
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String trapped;
 
     @Schema(
-        description =
-            "Map list of key and value of custom parameters. Note these must start with"
-                + " customKey and customValue if they are non-standard")
+            description =
+                    "Map list of key and value of custom parameters. Note these must start with"
+                            + " customKey and customValue if they are non-standard")
     private Map<String, String> allRequestParams;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;
 
 @Data

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java

@@ -12,24 +12,24 @@ import stirling.software.common.model.api.PDFFile;
 public class AddPasswordRequest extends PDFFile {
 
     @Schema(
-        description =
-            "The owner password to be added to the PDF file (Restricts what can be done"
-                + " with the document once it is opened)",
-        format = "password")
+            description =
+                    "The owner password to be added to the PDF file (Restricts what can be done"
+                            + " with the document once it is opened)",
+            format = "password")
     private String ownerPassword;
 
     @Schema(
-        description =
-            "The password to be added to the PDF file (Restricts the opening of the"
-                + " document itself.)",
-        format = "password")
+            description =
+                    "The password to be added to the PDF file (Restricts the opening of the"
+                            + " document itself.)",
+            format = "password")
     private String password;
 
     @Schema(
-        description = "The length of the encryption key",
-        allowableValues = {"40", "128", "256"},
-        defaultValue = "256",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The length of the encryption key",
+            allowableValues = {"40", "128", "256"},
+            defaultValue = "256",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private int keyLength = 256;
 
     @Schema(description = "Whether document assembly is prevented", defaultValue = "false")
@@ -39,8 +39,8 @@ public class AddPasswordRequest extends PDFFile {
     private Boolean preventExtractContent;
 
     @Schema(
-        description = "Whether content extraction for accessibility is prevented",
-        defaultValue = "false")
+            description = "Whether content extraction for accessibility is prevented",
+            defaultValue = "false")
     private Boolean preventExtractForAccessibility;
 
     @Schema(description = "Whether form filling is prevented", defaultValue = "false")
@@ -50,8 +50,8 @@ public class AddPasswordRequest extends PDFFile {
     private Boolean preventModify;
 
     @Schema(
-        description = "Whether modification of annotations is prevented",
-        defaultValue = "false")
+            description = "Whether modification of annotations is prevented",
+            defaultValue = "false")
     private Boolean preventModifyAnnotations;
 
     @Schema(description = "Whether printing of the document is prevented", defaultValue = "false")

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java

@@ -14,19 +14,19 @@ import stirling.software.common.model.api.security.RedactionArea;
 @EqualsAndHashCode(callSuper = true)
 public class ManualRedactPdfRequest extends PDFWithPageNums {
     @Schema(
-        description = "A list of areas that should be redacted",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "A list of areas that should be redacted",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private List<RedactionArea> redactions;
 
     @Schema(
-        description = "Convert the redacted PDF to an image",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Convert the redacted PDF to an image",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean convertPDFToImage;
 
     @Schema(
-        description = "The color used to fully redact certain pages",
-        defaultValue = "#000000",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The color used to fully redact certain pages",
+            defaultValue = "#000000",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String pageRedactionColor;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;
 
 @Data
@@ -11,38 +12,38 @@ import stirling.software.common.model.api.PDFFile;
 public class RedactPdfRequest extends PDFFile {
 
     @Schema(
-        description = "List of text to redact from the PDF",
-        defaultValue = "text,text2",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "List of text to redact from the PDF",
+            defaultValue = "text,text2",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String listOfText;
 
     @Schema(
-        description = "Whether to use regex for the listOfText",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Whether to use regex for the listOfText",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean useRegex;
 
     @Schema(
-        description = "Whether to use whole word search",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Whether to use whole word search",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean wholeWordSearch;
 
     @Schema(
-        description = "The color for redaction",
-        defaultValue = "#000000",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "The color for redaction",
+            defaultValue = "#000000",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private String redactColor;
 
     @Schema(
-        description = "Custom padding for redaction",
-        type = "number",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Custom padding for redaction",
+            type = "number",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private float customPadding;
 
     @Schema(
-        description = "Convert the redacted PDF to an image",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Convert the redacted PDF to an image",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean convertPDFToImage;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java

@@ -12,38 +12,38 @@ import stirling.software.common.model.api.PDFFile;
 public class SanitizePdfRequest extends PDFFile {
 
     @Schema(
-        description = "Remove JavaScript actions from the PDF",
-        defaultValue = "true",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove JavaScript actions from the PDF",
+            defaultValue = "true",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeJavaScript;
 
     @Schema(
-        description = "Remove embedded files from the PDF",
-        defaultValue = "true",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove embedded files from the PDF",
+            defaultValue = "true",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeEmbeddedFiles;
 
     @Schema(
-        description = "Remove XMP metadata from the PDF",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove XMP metadata from the PDF",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeXMPMetadata;
 
     @Schema(
-        description = "Remove document info metadata from the PDF",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove document info metadata from the PDF",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeMetadata;
 
     @Schema(
-        description = "Remove links from the PDF",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove links from the PDF",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeLinks;
 
     @Schema(
-        description = "Remove fonts from the PDF",
-        defaultValue = "false",
-        requiredMode = Schema.RequiredMode.REQUIRED)
+            description = "Remove fonts from the PDF",
+            defaultValue = "false",
+            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean removeFonts;
 }

stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java

@@ -14,8 +14,8 @@ import io.micrometer.core.instrument.search.Search;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.common.service.PostHogService;
 import stirling.software.SPDF.config.EndpointInspector;
+import stirling.software.common.service.PostHogService;
 
 @Service
 @RequiredArgsConstructor

stirling-pdf/src/main/resources/application.properties

@@ -29,13 +29,11 @@ spring.thymeleaf.encoding=UTF-8
 spring.web.resources.mime-mappings.webmanifest=application/manifest+json
 spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
 
-management.endpoints.web.exposure.include=beans
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
 spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
-spring.h2.console.enabled=true
+spring.h2.console.enabled=false
 spring.jpa.hibernate.ddl-auto=update
 server.servlet.session.timeout:30m
 # Change the default URL path for OpenAPI JSON
@@ -45,3 +43,5 @@ springdoc.swagger-ui.url=/v1/api-docs
 springdoc.swagger-ui.path=/index.html
 posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
 posthog.host=https://eu.i.posthog.com
+
+spring.main.allow-bean-definition-overriding=true

stirling-pdf/src/main/resources/messages_en_GB.properties

@@ -3,6 +3,138 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
 pdfPrompt=Select PDF(s)
@@ -87,6 +219,12 @@ addToDoc=Add to Document
 reset=Reset
 apply=Apply
 noFileSelected=No file selected. Please upload one.
+view=View
+cancel=Cancel
+
+back.toSettings=Back to Settings
+back.toHome=Back to Home
+back.toAdmin=Back to Admin
 
 legal.privacy=Privacy Policy
 legal.terms=Terms and Conditions
@@ -127,6 +265,7 @@ enterpriseEdition.button=Upgrade to Pro
 enterpriseEdition.warning=This feature is only available to Pro users.
 enterpriseEdition.yamlAdvert=Stirling PDF Pro supports YAML configuration files and other SSO features.
 enterpriseEdition.ssoAdvert=Looking for more user management features? Check out Stirling PDF Pro
+enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro licence or higher
 
 
 #################
@@ -207,6 +346,8 @@ account.property=Property
 account.webBrowserSettings=Web Browser Setting
 account.syncToBrowser=Sync Account -> Browser
 account.syncToAccount=Sync Account <- Browser
+account.adminTitle=Administrator Tools
+account.adminNotif=You have admin privileges. Access system settings and user management.
 
 
 adminUserSettings.title=User Control Settings
@@ -238,6 +379,39 @@ adminUserSettings.disabledUsers=Disabled Users:
 adminUserSettings.totalUsers=Total Users:
 adminUserSettings.lastRequest=Last Request
 adminUserSettings.usage=View Usage
+adminUserSettings.teams=View/Edit Teams
+adminUserSettings.team=Team
+adminUserSettings.manageTeams=Manage Teams
+adminUserSettings.createTeam=Create Team
+adminUserSettings.viewTeam=View Team
+adminUserSettings.deleteTeam=Delete Team
+adminUserSettings.teamName=Team Name
+adminUserSettings.teamExists=Team already exists
+adminUserSettings.teamCreated=Team created successfully
+adminUserSettings.teamChanged=User's team was updated
+adminUserSettings.totalMembers=Total Members
+adminUserSettings.confirmDeleteTeam=Are you sure you want to delete this team?
+
+teamCreated=Team created successfully
+teamExists=A team with that name already exists
+teamNameExists=Another team with that name already exists
+teamNotFound=Team not found
+teamDeleted=Team deleted
+teamHasUsers=Cannot delete a team with users assigned
+teamRenamed=Team renamed successfully
+
+# Team user management
+team.addUser=Add User to Team
+team.selectUser=Select User
+team.warning.moveUser=Warning: This will move the user from "{0}" team to "{1}" team. Are you sure?
+team.confirm.moveUser=Are you sure you want to move this user from "{0}" team to "{1}" team?
+team.userAdded=User successfully added to team
+team.back=Back to Teams
+team.internal=Internal Team
+team.internalTeamNotAccessible=The Internal team is a system team and cannot be accessed
+team.cannotMoveInternalUsers=Users in the Internal team cannot be moved to other teams
+
+
 
 endpointStatistics.title=Endpoint Statistics
 endpointStatistics.header=Endpoint Statistics
@@ -1026,6 +1200,7 @@ merge.header=Merge multiple PDFs (2+)
 merge.sortByName=Sort by name
 merge.sortByDate=Sort by date
 merge.removeCertSign=Remove digital signature in the merged file?
+merge.generateToc=Generate table of contents in the merged file?
 merge.submit=Merge
 
 
@@ -1475,3 +1650,57 @@ cookieBanner.preferencesModal.necessary.description=These cookies are essential
 cookieBanner.preferencesModal.analytics.title=Analytics
 cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)
+
+
+# Table of Contents Feature
+home.editTableOfContents.title=Edit Table of Contents
+home.editTableOfContents.desc=Add or edit bookmarks and table of contents in PDF documents
+
+editTableOfContents.tags=bookmarks,toc,navigation,index,table of contents,chapters,sections,outline
+editTableOfContents.title=Edit Table of Contents
+editTableOfContents.header=Add or Edit PDF Table of Contents
+editTableOfContents.replaceExisting=Replace existing bookmarks (uncheck to append to existing)
+editTableOfContents.editorTitle=Bookmark Editor
+editTableOfContents.editorDesc=Add and arrange bookmarks below. Click + to add child bookmarks.
+editTableOfContents.addBookmark=Add New Bookmark
+editTableOfContents.desc.1=This tool allows you to add or edit the table of contents (bookmarks) in a PDF document.
+editTableOfContents.desc.2=You can create a hierarchical structure by adding child bookmarks to parent bookmarks.
+editTableOfContents.desc.3=Each bookmark requires a title and target page number.
+editTableOfContents.submit=Apply Table of Contents
+
+

stirling-pdf/src/main/resources/messages_en_US.properties

@@ -3,6 +3,138 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
 pdfPrompt=Select PDF(s)
@@ -127,6 +259,7 @@ enterpriseEdition.button=Upgrade to Pro
 enterpriseEdition.warning=This feature is only available to Pro users.
 enterpriseEdition.yamlAdvert=Stirling PDF Pro supports YAML configuration files and other SSO features.
 enterpriseEdition.ssoAdvert=Looking for more user management features? Check out Stirling PDF Pro
+enterpriseEdition.proTeamFeatureDisabled=Team management features require a Pro license or higher
 
 
 #################
@@ -1380,14 +1513,13 @@ error.copyStack=Copy Stack Trace
 error.githubSubmit=GitHub - Submit a ticket
 error.discordSubmit=Discord - Submit Support post
 
-
 #remove-image
 removeImage.title=Remove image
 removeImage.header=Remove image
 removeImage.removeImage=Remove image
 removeImage.submit=Remove image
 
-
+#split-by-chapters
 splitByChapters.title=Split PDF by Chapters
 splitByChapters.header=Split PDF by Chapters
 splitByChapters.bookmarkLevel=Bookmark Level
@@ -1454,8 +1586,8 @@ validateSignature.cert.bits=bits
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=How we use Cookies
-cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you—helping us improve our tools and keep building features you'll love.
-cookieBanner.popUp.description.2=If you’d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
+cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you\u2014helping us improve our tools and keep building features you'll love.
+cookieBanner.popUp.description.2=If you\u2019d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
 cookieBanner.popUp.acceptAllBtn=Okay
 cookieBanner.popUp.acceptNecessaryBtn=No Thanks
 cookieBanner.popUp.showPreferencesBtn=Manage preferences
@@ -1467,11 +1599,46 @@ cookieBanner.preferencesModal.closeIconLabel=Close modal
 cookieBanner.preferencesModal.serviceCounterLabel=Service|Services
 cookieBanner.preferencesModal.subtitle=Cookie Usage
 cookieBanner.preferencesModal.description.1=Stirling PDF uses cookies and similar technologies to enhance your experience and understand how our tools are used. This helps us improve performance, develop the features you care about, and provide ongoing support to our users.
-cookieBanner.preferencesModal.description.2=Stirling PDF cannot—and will never—track or access the content of the documents you use.
+cookieBanner.preferencesModal.description.2=Stirling PDF cannot\u2014and will never\u2014track or access the content of the documents you use.
 cookieBanner.preferencesModal.description.3=Your privacy and trust are at the core of what we do.
 cookieBanner.preferencesModal.necessary.title.1=Strictly Necessary Cookies
 cookieBanner.preferencesModal.necessary.title.2=Always Enabled
-cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms—which is why they can’t be turned off.
+cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms\u2014which is why they can\u2019t be turned off.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
+cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured\u2014Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)

stirling-pdf/src/main/resources/messages_eu_ES.properties

@@ -3,6 +3,138 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Font Size
 addPageNumbers.fontName=Font Name
 pdfPrompt=Hautatu PDFa(k)
@@ -1454,8 +1586,8 @@ validateSignature.cert.bits=bits
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=How we use Cookies
-cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you—helping us improve our tools and keep building features you'll love.
-cookieBanner.popUp.description.2=If you’d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
+cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you?helping us improve our tools and keep building features you'll love.
+cookieBanner.popUp.description.2=If you?d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
 cookieBanner.popUp.acceptAllBtn=Okay
 cookieBanner.popUp.acceptNecessaryBtn=No Thanks
 cookieBanner.popUp.showPreferencesBtn=Manage preferences
@@ -1467,11 +1599,46 @@ cookieBanner.preferencesModal.closeIconLabel=Close modal
 cookieBanner.preferencesModal.serviceCounterLabel=Service|Services
 cookieBanner.preferencesModal.subtitle=Cookie Usage
 cookieBanner.preferencesModal.description.1=Stirling PDF uses cookies and similar technologies to enhance your experience and understand how our tools are used. This helps us improve performance, develop the features you care about, and provide ongoing support to our users.
-cookieBanner.preferencesModal.description.2=Stirling PDF cannot—and will never—track or access the content of the documents you use.
+cookieBanner.preferencesModal.description.2=Stirling PDF cannot?and will never?track or access the content of the documents you use.
 cookieBanner.preferencesModal.description.3=Your privacy and trust are at the core of what we do.
 cookieBanner.preferencesModal.necessary.title.1=Strictly Necessary Cookies
 cookieBanner.preferencesModal.necessary.title.2=Always Enabled
-cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms—which is why they can’t be turned off.
+cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms?which is why they can?t be turned off.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
+cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured?Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)

stirling-pdf/src/main/resources/messages_id_ID.properties

@@ -3,6 +3,138 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Ukuran Fonta
 addPageNumbers.fontName=Nama Fonta
 pdfPrompt=Pilih PDF
@@ -1454,8 +1586,8 @@ validateSignature.cert.bits=bits
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=How we use Cookies
-cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you—helping us improve our tools and keep building features you'll love.
-cookieBanner.popUp.description.2=If you’d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
+cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you?helping us improve our tools and keep building features you'll love.
+cookieBanner.popUp.description.2=If you?d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
 cookieBanner.popUp.acceptAllBtn=Okay
 cookieBanner.popUp.acceptNecessaryBtn=No Thanks
 cookieBanner.popUp.showPreferencesBtn=Manage preferences
@@ -1467,11 +1599,46 @@ cookieBanner.preferencesModal.closeIconLabel=Close modal
 cookieBanner.preferencesModal.serviceCounterLabel=Service|Services
 cookieBanner.preferencesModal.subtitle=Cookie Usage
 cookieBanner.preferencesModal.description.1=Stirling PDF uses cookies and similar technologies to enhance your experience and understand how our tools are used. This helps us improve performance, develop the features you care about, and provide ongoing support to our users.
-cookieBanner.preferencesModal.description.2=Stirling PDF cannot—and will never—track or access the content of the documents you use.
+cookieBanner.preferencesModal.description.2=Stirling PDF cannot?and will never?track or access the content of the documents you use.
 cookieBanner.preferencesModal.description.3=Your privacy and trust are at the core of what we do.
 cookieBanner.preferencesModal.necessary.title.1=Strictly Necessary Cookies
 cookieBanner.preferencesModal.necessary.title.2=Always Enabled
-cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms—which is why they can’t be turned off.
+cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms?which is why they can?t be turned off.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
+cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured?Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)

stirling-pdf/src/main/resources/messages_it_IT.properties

@@ -3,16 +3,148 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amarico
+lang.ara=Arabo
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (cirillico)
+lang.bel=Bielorusso
+lang.ben=Bengalese
+lang.bod=Tibetano
+lang.bos=Bosniaco
+lang.bre=Bretone
+lang.bul=Bulgaro
+lang.cat=Catalano
+lang.ceb=Cebuano
+lang.ces=Ceco
+lang.chi_sim=Cinese (semplificato)
+lang.chi_sim_vert=Cinese (semplificato, verticale)
+lang.chi_tra=Cinese (Tradizionale)
+lang.chi_tra_vert=Cinese (tradizionale, verticale)
+lang.chr=Cherokee
+lang.cos=Corso
+lang.cym=Gallese
+lang.dan=Danese
+lang.dan_frak=Danese (Fraktur)
+lang.deu=Tedesco
+lang.deu_frak=Tedesco (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greco
+lang.eng=Inglese
+lang.enm=Inglese, Medio (1100-1500)
+lang.epo=Esperanto
+lang.equ=Modulo di rilevamento di equazioni/matematiche
+lang.est=Estone
+lang.eus=Basco
+lang.fao=Faroese
+lang.fas=Persiano
+lang.fil=Filippino
+lang.fin=Finlandese
+lang.fra=Francese
+lang.frk=Franco
+lang.frm=Francese, Medio (ca.1400-1600)
+lang.fry=Frisone occidentale
+lang.gla=Gaelico scozzese
+lang.gle=Irlandese
+lang.glg=Galiziano
+lang.grc=Greco antico
+lang.guj=Gujarati
+lang.hat=Haitiano, Creolo Haitiano
+lang.heb=Ebraico
+lang.hin=Hindi
+lang.hrv=Croato
+lang.hun=Ungherese
+lang.hye=Armeno
+lang.iku=Inuktitut
+lang.ind=Indonesiano
+lang.isl=Islandese
+lang.ita=Italiano
+lang.ita_old=Italiano (antico)
+lang.jav=Giavanese
+lang.jpn=Giapponese
+lang.jpn_vert=Giapponese (verticale)
+lang.kan=Kannada
+lang.kat=Georgiano
+lang.kat_old=Georgiano (antico)
+lang.kaz=kazako
+lang.khm=Khmer centrale
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Curdo settentrionale
+lang.kor=Coreano
+lang.kor_vert=Coreano (verticale)
+lang.lao=Lao
+lang.lat=Latino
+lang.lav=Lettone
+lang.lit=Lituano
+lang.ltz=Lussemburghese
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedone
+lang.mlt=Maltese
+lang.mon=Mongola
+lang.mri=Maori
+lang.msa=Malase
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Olandese; Fiammingo
+lang.nor=Norvegese
+lang.oci=Occitano (post 1500)
+lang.ori=Oriya
+lang.osd=Modulo di orientamento e rilevamento degli script
+lang.pan=Panjabi, Punjabi
+lang.pol=Polacco
+lang.por=Portoghese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Rumeno, Moldavo, Moldovan
+lang.rus=Russo
+lang.san=Sanscrito
+lang.sin=Singala, Singalese
+lang.slk=Slovacco
+lang.slk_frak=Slovacco (Fraktur)
+lang.slv=Sloveno
+lang.snd=Sindhi
+lang.spa=Spagnolo
+lang.spa_old=Spagnolo (antico)
+lang.sqi=Albanese
+lang.srp=Serbo
+lang.srp_latn=Serbo (latino)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Svedese
+lang.syr=Sriaco
+lang.tam=Tamil
+lang.tat=Tataro
+lang.tel=Telugu
+lang.tgk=Tagiko
+lang.tgl=Tagalog
+lang.tha=Tailandese
+lang.tir=Tigrino
+lang.ton=Tonga (Isole Tonga)
+lang.tur=Turco
+lang.uig=Uighur, Uyghur
+lang.ukr=Ucraino
+lang.urd=Urdu
+lang.uzb=Uzbeko
+lang.uzb_cyrl=Uzbeko (cirillico)
+lang.vie=Vietnamita
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Dimensione del font
 addPageNumbers.fontName=Nome del font
 pdfPrompt=Scegli PDF
-multiPdfPrompt=Scegli 2 o più PDF
-multiPdfDropPrompt=Scegli (o trascina e rilascia) uno o più PDF
+multiPdfPrompt=Scegli 2 o più PDF
+multiPdfDropPrompt=Scegli (o trascina e rilascia) uno o più PDF
 imgPrompt=Scegli immagine/i
 genericSubmit=Invia
 uploadLimit=Dimensione massima del file:
-uploadLimitExceededSingular=è troppo grande. La dimensione massima consentita è
-uploadLimitExceededPlural=sono troppo grandi. La dimensione massima consentita è
+uploadLimitExceededSingular=è troppo grande. La dimensione massima consentita è
+uploadLimitExceededPlural=sono troppo grandi. La dimensione massima consentita è
 processTimeWarning=Nota: Questo processo potrebbe richiedere fino a un minuto in base alla dimensione dei file
 pageOrderPrompt=Ordine delle pagine (inserisci una lista di numeri separati da virgola):
 pageSelectionPrompt=Selezione pagina personalizzata (inserisci un elenco separato da virgole di numeri di pagina 1,5,6 o funzioni come 2n+1) :
@@ -37,12 +169,12 @@ sizes.small=Piccolo
 sizes.medium=Medio
 sizes.large=Grande
 sizes.x-large=Extra-Large
-error.pdfPassword=Il documento PDF è protetto da password e la password non è stata fornita oppure non era corretta
+error.pdfPassword=Il documento PDF è protetto da password e la password non è stata fornita oppure non era corretta
 delete=Elimina
 username=Nome utente
 password=Password
 welcome=Benvenuto
-property=Proprietà
+property=Proprietà
 black=Nero
 white=Bianco
 red=Rosso
@@ -56,18 +188,18 @@ no=No
 changedCredsMessage=Credenziali modificate!
 notAuthenticatedMessage=Utente non autenticato.
 userNotFoundMessage=Utente non trovato.
-incorrectPasswordMessage=La password attuale non è corretta.
-usernameExistsMessage=Il nuovo nome utente esiste già.
-invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
+incorrectPasswordMessage=La password attuale non è corretta.
+usernameExistsMessage=Il nuovo nome utente esiste già.
+invalidUsernameMessage=Nome utente non valido, il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- o deve essere un indirizzo email valido.
 invalidPasswordMessage=La password non deve essere vuota e non deve contenere spazi all'inizio o alla fine.
 confirmPasswordErrorMessage=La nuova password e la conferma della nuova password devono corrispondere.
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
-deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
+deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente
-disabledCurrentUserMessage=L'utente corrente non può essere disabilitato
-downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
-userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
-userAlreadyExistsWebMessage=L'utente esiste già come utente web.
+disabledCurrentUserMessage=L'utente corrente non può essere disabilitato
+downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
+userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
+userAlreadyExistsWebMessage=L'utente esiste già come utente web.
 error=Errore
 oops=Oops!
 help=Aiuto
@@ -90,7 +222,7 @@ noFileSelected=Nessun file selezionato. Caricane uno.
 
 legal.privacy=Informativa sulla privacy
 legal.terms=Termini e Condizioni
-legal.accessibility=Accessibilità
+legal.accessibility=Accessibilità
 legal.cookie=Informativa sui cookie
 legal.impressum=Informazioni legali
 legal.showCookieBanner=Preferenze sui cookie
@@ -98,7 +230,7 @@ legal.showCookieBanner=Preferenze sui cookie
 ###############
 #   Pipeline  #
 ###############
-pipeline.header=Menù pipeline (Beta)
+pipeline.header=Menù pipeline (Beta)
 pipeline.uploadButton=Caricamento personalizzato
 pipeline.configureButton=Configura
 pipeline.defaultOption=Personalizzato
@@ -124,9 +256,9 @@ pipelineOptions.validateButton=Convalidare
 #  ENTERPRISE EDITION  #
 ########################
 enterpriseEdition.button=Aggiorna alla versione Pro
-enterpriseEdition.warning=Questa funzionalità è disponibile solo per gli utenti Pro.
-enterpriseEdition.yamlAdvert=Stirling PDF Pro supporta i file di configurazione YAML e altre funzionalità SSO.
-enterpriseEdition.ssoAdvert=Cerchi altre funzionalità di gestione degli utenti? Dai un'occhiata a Stirling PDF Pro
+enterpriseEdition.warning=Questa funzionalità è disponibile solo per gli utenti Pro.
+enterpriseEdition.yamlAdvert=Stirling PDF Pro supporta i file di configurazione YAML e altre funzionalità SSO.
+enterpriseEdition.ssoAdvert=Cerchi altre funzionalità di gestione degli utenti? Dai un'occhiata a Stirling PDF Pro
 
 
 #################
@@ -137,7 +269,7 @@ analytics.paragraph1=Stirling PDF ha opt-in analytics per aiutarci a migliorare
 analytics.paragraph2=Si prega di prendere in considerazione l'attivazione dell'analytics per aiutare Stirling-PDF a crescere e consentirci di comprendere meglio i nostri utenti.
 analytics.enable=Abilita analytics
 analytics.disable=Disabilita analytics
-analytics.settings=È possibile modificare le impostazioni per analitycs nel file config/settings.yml
+analytics.settings=È possibile modificare le impostazioni per analitycs nel file config/settings.yml
 
 
 #############
@@ -145,7 +277,7 @@ analytics.settings=È possibile modificare le impostazioni per analitycs nel fil
 #############
 navbar.favorite=Preferiti
 navbar.recent=Nuovo e aggiornato di recente
-navbar.darkmode=Modalità Scura
+navbar.darkmode=Modalità Scura
 navbar.language=Lingue
 navbar.settings=Impostazioni
 navbar.allTools=Strumenti
@@ -164,7 +296,7 @@ navbar.sections.popular=Popolare
 #############
 settings.title=Impostazioni
 settings.update=Aggiornamento disponibile
-settings.updateAvailable={0} è la versione attualmente installata. Una nuova versione ({1}) è disponibile.
+settings.updateAvailable={0} è la versione attualmente installata. Una nuova versione ({1}) è disponibile.
 settings.appVersion=Versione App:
 settings.downloadOption.title=Scegli opzione di download (Per file singoli non compressi):
 settings.downloadOption.1=Apri in questa finestra
@@ -203,7 +335,7 @@ account.signOut=Logout
 account.yourApiKey=La tua API Key
 account.syncTitle=Sincronizza le impostazioni del browser con l'account
 account.settingsCompare=Confronto delle impostazioni:
-account.property=Proprietà
+account.property=Proprietà
 account.webBrowserSettings=Impostazione del browser web
 account.syncToBrowser=Sincronizza account -> Browser
 account.syncToAccount=Sincronizza account <- Browser
@@ -217,7 +349,7 @@ adminUserSettings.addUser=Aggiungi un nuovo Utente
 adminUserSettings.deleteUser=Elimina utente
 adminUserSettings.confirmDeleteUser=L'utente deve essere eliminato?
 adminUserSettings.confirmChangeUserStatus=L'utente dovrebbe essere disabilitato/abilitato?
-adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
+adminUserSettings.usernameInfo=Il nome utente può contenere solo lettere, numeri e i seguenti caratteri speciali @._+- oppure deve essere un indirizzo email valido.
 adminUserSettings.roles=Ruoli
 adminUserSettings.role=Ruolo
 adminUserSettings.actions=Azioni
@@ -272,24 +404,24 @@ database.deleteBackupFile=Elimina file di backup
 database.importBackupFile=Importa file di backup
 database.createBackupFile=Crea file di backup
 database.downloadBackupFile=Scarica il file di backup
-database.info_1=Quando si importano i dati, è fondamentale garantire la struttura corretta. Se non sei sicuro di quello che stai facendo, chiedi consiglio e supporto a un professionista. Un errore nella struttura può causare malfunzionamenti dell'applicazione, fino alla completa impossibilità di eseguire l'applicazione.
-database.info_2=Il nome del file non ha importanza durante il caricamento. Verrà rinominato in seguito per seguire il formato backup_user__yyyyMMddHHmm.sql,garantendo una convenzione di denominazione coerente.
+database.info_1=Quando si importano i dati, è fondamentale garantire la struttura corretta. Se non sei sicuro di quello che stai facendo, chiedi consiglio e supporto a un professionista. Un errore nella struttura può causare malfunzionamenti dell'applicazione, fino alla completa impossibilità di eseguire l'applicazione.
+database.info_2=Il nome del file non ha importanza durante il caricamento. Verrà rinominato in seguito per seguire il formato backup_user__yyyyMMddHHmm.sql,garantendo una convenzione di denominazione coerente.
 database.submit=Importa Backup
-database.importIntoDatabaseSuccessed=L'importazione nel database è avvenuta con successo
+database.importIntoDatabaseSuccessed=L'importazione nel database è avvenuta con successo
 database.backupCreated=Backup del database riuscito
 database.fileNotFound=File non trovato
 database.fileNullOrEmpty=Il file non deve essere nullo o vuoto
 database.failedImportFile=Importazione file non riuscita
-database.notSupported=Questa funzione non è disponibile per la connessione al database.
+database.notSupported=Questa funzione non è disponibile per la connessione al database.
 
-session.expired=La tua sessione è scaduta. Aggiorna la pagina e riprova.
+session.expired=La tua sessione è scaduta. Aggiorna la pagina e riprova.
 session.refreshPage=Aggiorna pagina
 
 #############
 # HOME-PAGE #
 #############
 home.desc=La tua pagina auto-gestita per modificare qualsiasi PDF.
-home.searchBar=Cerca funzionalità...
+home.searchBar=Cerca funzionalità...
 
 
 home.viewPdf.title=Visualizza/Modifica PDF
@@ -302,7 +434,7 @@ home.showFavorites=Mostra preferiti
 home.legacyHomepage=Vecchia homepage
 home.newHomePage=Prova la nostra nuova homepage!
 home.alphabetical=Alfabetico
-home.globalPopularity=Popolarità
+home.globalPopularity=Popolarità
 home.sortBy=Ordinamento:
 
 home.multiTool.title=Multifunzione PDF
@@ -310,11 +442,11 @@ home.multiTool.desc=Unisci, Ruota, Riordina, e Rimuovi pagine
 multiTool.tags=Strumento multiplo,operazione multipla,interfaccia utente,trascinamento clic,front-end,lato client
 
 home.merge.title=Unisci
-home.merge.desc=Unisci facilmente più PDF in uno.
+home.merge.desc=Unisci facilmente più PDF in uno.
 merge.tags=unione,operazioni sulla pagina,back-end,lato server
 
 home.split.title=Dividi
-home.split.desc=Dividi un singolo PDF in più documenti.
+home.split.desc=Dividi un singolo PDF in più documenti.
 split.tags=Operazioni sulla pagina,divisione,multi pagina,taglio,lato server
 
 home.rotate.title=Ruota
@@ -365,11 +497,11 @@ home.compressPdfs.desc=Comprimi PDF per ridurne le dimensioni.
 compressPdfs.tags=comprimere,piccolo,minuscolo
 
 home.unlockPDFForms.title=Sblocca moduli PDF
-home.unlockPDFForms.desc=Rimuovi la proprietà di sola lettura dei campi del modulo in un documento PDF.
+home.unlockPDFForms.desc=Rimuovi la proprietà di sola lettura dei campi del modulo in un documento PDF.
 unlockPDFForms.tags=rimuovi,elimina,modulo,campo,sola lettura
 
-home.changeMetadata.title=Modifica Proprietà
-home.changeMetadata.desc=Modifica/Aggiungi/Rimuovi le proprietà di un documento PDF.
+home.changeMetadata.title=Modifica Proprietà
+home.changeMetadata.desc=Modifica/Aggiungi/Rimuovi le proprietà di un documento PDF.
 changeMetadata.tags=Titolo,autore,data,creazione,ora,editore,produttore,statistiche
 
 home.fileToPDF.title=Converti file in PDF
@@ -407,10 +539,10 @@ PDFToHTML.tags=contenuto web,facile da usare per il browser
 
 home.PDFToXML.title=Da PDF a XML
 home.PDFToXML.desc=Converti un PDF in XML.
-PDFToXML.tags=estrazione dati,contenuto strutturato,interoperabilità,trasformazione,conversione
+PDFToXML.tags=estrazione dati,contenuto strutturato,interoperabilità,trasformazione,conversione
 
 home.ScannerImageSplit.title=Trova/Dividi foto scansionate
-home.ScannerImageSplit.desc=Estrai più foto da una singola foto o PDF.
+home.ScannerImageSplit.desc=Estrai più foto da una singola foto o PDF.
 ScannerImageSplit.tags=separa,rileva automaticamente,scansiona,multi-foto,organizza
 
 home.sign.title=Firma
@@ -446,7 +578,7 @@ home.removeCertSign.desc=Rimuovi la firma del certificato dal PDF
 removeCertSign.tags=autenticare,PEM,P12,ufficiale,decifrare
 
 home.pageLayout.title=Layout multipagina
-home.pageLayout.desc=Unisci più pagine di un documento PDF in un'unica pagina
+home.pageLayout.desc=Unisci più pagine di un documento PDF in un'unica pagina
 pageLayout.tags=unire,comporre,visualizzazione singola,organizzare
 
 home.scalePages.title=Regola le dimensioni/scala della pagina
@@ -454,7 +586,7 @@ home.scalePages.desc=Modificare le dimensioni/scala della pagina e/o dei suoi co
 scalePages.tags=ridimensionare,modificare,dimensionare,adattare
 
 home.pipeline.title=Pipeline
-home.pipeline.desc=Esegui più azioni sui PDF definendo script di pipeline
+home.pipeline.desc=Esegui più azioni sui PDF definendo script di pipeline
 pipeline.tags=automatizzare,sequenziare,scriptare,elaborare in batch
 
 home.add-page-numbers.title=Aggiungi numeri di pagina
@@ -466,7 +598,7 @@ home.auto-rename.desc=Rinomina automaticamente un file PDF in base all'intestazi
 auto-rename.tags=rilevamento automatico,basato su intestazione,organizzazione,rietichettatura
 
 home.adjust-contrast.title=Regola colori/contrasto
-home.adjust-contrast.desc=Regola contrasto, saturazione e luminosità di un PDF
+home.adjust-contrast.desc=Regola contrasto, saturazione e luminosità di un PDF
 adjust-contrast.tags=correzione del colore,messa a punto,modifica,miglioramento
 
 home.crop.title=Ritaglia PDF
@@ -547,7 +679,7 @@ tableExtraxt.tags=CSV,Estrazione tabella,estrai,converti
 
 
 home.autoSizeSplitPDF.title=Divisione automatica per dimensione/numero
-home.autoSizeSplitPDF.desc=Dividi un singolo PDF in più documenti in base alle dimensioni, al numero di pagine o al numero di documenti
+home.autoSizeSplitPDF.desc=Dividi un singolo PDF in più documenti in base alle dimensioni, al numero di pagine o al numero di documenti
 autoSizeSplitPDF.tags=pdf,diviso,documento,organizzazione
 
 
@@ -556,7 +688,7 @@ home.overlay-pdfs.desc=Sovrappone i PDF sopra un altro PDF
 overlay-pdfs.tags=Sovrapponi
 
 home.split-by-sections.title=Dividi PDF per sezioni
-home.split-by-sections.desc=Dividi ciascuna pagina di un PDF in sezioni orizzontali e verticali più piccole
+home.split-by-sections.desc=Dividi ciascuna pagina di un PDF in sezioni orizzontali e verticali più piccole
 split-by-sections.tags=Dividi sezione,dividi,personalizza
 
 home.AddStampRequest.title=Aggiungi timbro al PDF
@@ -570,7 +702,7 @@ removeImagePdf.tags=Rimuovi immagine,operazioni sulla pagina,back-end,lato serve
 
 
 home.splitPdfByChapters.title=Dividi PDF per capitoli
-home.splitPdfByChapters.desc=Dividi un PDF in più file in base alla struttura dei capitoli.
+home.splitPdfByChapters.desc=Dividi un PDF in più file in base alla struttura dei capitoli.
 splitPdfByChapters.tags=dividi,capitoli,segnalibri,organizza
 
 home.validateSignature.title=Convalida la firma PDF
@@ -581,7 +713,7 @@ validateSignature.tags=firma,verifica,convalida,pdf,certificato,firma digitale,c
 replace-color.title=Sostituisci-Inverti-Colore
 replace-color.header=Sostituisci-Inverti colore PDF
 home.replaceColorPdf.title=Sostituisci e inverti il colore
-home.replaceColorPdf.desc=Sostituisci il colore del testo e dello sfondo nel PDF e inverti il ​​colore completo del PDF per ridurre le dimensioni del file
+home.replaceColorPdf.desc=Sostituisci il colore del testo e dello sfondo nel PDF e inverti il ??colore completo del PDF per ridurre le dimensioni del file
 replaceColorPdf.tags=Sostituisci colore, Operazioni di pagina, Back-end, lato server
 replace-color.selectText.1=Sostituisci o inverti le opzioni del colore
 replace-color.selectText.2=Predefinito (colori ad alto contrasto predefiniti)
@@ -609,11 +741,11 @@ login.header=Accedi
 login.signin=Accedi
 login.rememberme=Ricordami
 login.invalid=Nome utente o password errati.
-login.locked=Il tuo account è stato bloccato.
+login.locked=Il tuo account è stato bloccato.
 login.signinTitle=Per favore accedi
 login.ssoSignIn=Accedi tramite Single Sign-on
 login.oAuth2AutoCreateDisabled=Creazione automatica utente OAUTH2 DISABILITATA
-login.oAuth2AdminBlockedUser=La registrazione o l'accesso degli utenti non registrati è attualmente bloccata. Si prega di contattare l'amministratore.
+login.oAuth2AdminBlockedUser=La registrazione o l'accesso degli utenti non registrati è attualmente bloccata. Si prega di contattare l'amministratore.
 login.oauth2RequestNotFound=Richiesta di autorizzazione non trovata
 login.oauth2InvalidUserInfoResponse=Risposta relativa alle informazioni utente non valida
 login.oauth2invalidRequest=Richiesta non valida
@@ -621,8 +753,8 @@ login.oauth2AccessDenied=Accesso negato
 login.oauth2InvalidTokenResponse=Risposta token non valida
 login.oauth2InvalidIdToken=Id Token non valido
 login.relyingPartyRegistrationNotFound=Nessuna registrazione di parte affidabile trovata
-login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato con questo nome utente. Si prega di contattare l'amministratore.
-login.alreadyLoggedIn=Hai già effettuato l'accesso a
+login.userIsDisabled=L'utente è disattivato, l'accesso è attualmente bloccato con questo nome utente. Si prega di contattare l'amministratore.
+login.alreadyLoggedIn=Hai già effettuato l'accesso a
 login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova.
 login.toManySessions=Hai troppe sessioni attive
 login.logoutMessage=Sei stato disconnesso.
@@ -692,22 +824,22 @@ getPdfInfo.header=Ottieni informazioni in PDF
 getPdfInfo.submit=Ottieni informazioni
 getPdfInfo.downloadJson=Scarica JSON
 getPdfInfo.summary=Riepilogo PDF
-getPdfInfo.summary.encrypted=Questo PDF è crittografato, quindi potrebbe presentare problemi con alcune applicazioni
+getPdfInfo.summary.encrypted=Questo PDF è crittografato, quindi potrebbe presentare problemi con alcune applicazioni
 getPdfInfo.summary.permissions=Questo PDF ha {0} permessi limitati che potrebbero limitare le operazioni che puoi eseguire con esso
-getPdfInfo.summary.compliance=Questo PDF è conforme allo standard {0}
+getPdfInfo.summary.compliance=Questo PDF è conforme allo standard {0}
 getPdfInfo.summary.basicInfo=Informazioni di base
 getPdfInfo.summary.docInfo=Informazioni sul documento
-getPdfInfo.summary.encrypted.alert=PDF crittografato - Questo documento è protetto da password
+getPdfInfo.summary.encrypted.alert=PDF crittografato - Questo documento è protetto da password
 getPdfInfo.summary.not.encrypted.alert=PDF non crittografato - Nessuna protezione tramite password
 getPdfInfo.summary.permissions.alert=Autorizzazioni limitate: {0} azioni non sono consentite
 getPdfInfo.summary.all.permissions.alert=Tutti i permessi consentiti
 getPdfInfo.summary.compliance.alert={0} Conforme
-getPdfInfo.summary.no.compliance.alert=Nessuno standard di conformità
+getPdfInfo.summary.no.compliance.alert=Nessuno standard di conformità
 getPdfInfo.summary.security.section=Stato di sicurezza
 getPdfInfo.section.BasicInfo=Informazioni di base sul documento PDF, tra cui dimensione del file, numero di pagine e lingua
-getPdfInfo.section.Metadata=Metadati del documento, inclusi titolo, autore, data di creazione e altre proprietà del documento
+getPdfInfo.section.Metadata=Metadati del documento, inclusi titolo, autore, data di creazione e altre proprietà del documento
 getPdfInfo.section.DocumentInfo=Dettagli tecnici sulla struttura e la versione del documento PDF
-getPdfInfo.section.Compliancy=Informazioni sulla conformità agli standard PDF(PDF/A,PDF/X,ecc.)
+getPdfInfo.section.Compliancy=Informazioni sulla conformità agli standard PDF(PDF/A,PDF/X,ecc.)
 getPdfInfo.section.Encryption=Dettagli di sicurezza e crittografia del documento
 getPdfInfo.section.Permissions=Impostazioni di autorizzazione del documento che controllano quali azioni possono essere eseguite
 getPdfInfo.section.Other=Componenti aggiuntivi del documento come segnalibri, livelli e file incorporati
@@ -766,7 +898,7 @@ AddStampRequest.stampImage=Immagine del timbro
 AddStampRequest.alphabet=Alfabeto
 AddStampRequest.fontSize=Dimensione carattere/immagine
 AddStampRequest.rotation=Rotazione
-AddStampRequest.opacity=Opacità
+AddStampRequest.opacity=Opacità
 AddStampRequest.position=Posizione
 AddStampRequest.overrideX=Sostituisci la coordinata X
 AddStampRequest.overrideY=Sostituisci la coordinata Y
@@ -798,7 +930,7 @@ addPageNumbers.selectText.5=Pagine da numerare
 addPageNumbers.selectText.6=Testo personalizzato
 addPageNumbers.customTextDesc=Testo personalizzato
 addPageNumbers.numberPagesDesc=Quali pagine numerare, impostazione predefinita "tutte", accetta anche 1-5 o 2,5,9 ecc
-addPageNumbers.customNumberDesc=Il valore predefinito è {n}, accetta anche 'Pagina {n} di {total}', 'Testo-{n}', '{filename}-{n}
+addPageNumbers.customNumberDesc=Il valore predefinito è {n}, accetta anche 'Pagina {n} di {total}', 'Testo-{n}', '{filename}-{n}
 addPageNumbers.submit=Aggiungi numeri di pagina
 
 
@@ -812,7 +944,7 @@ auto-rename.submit=Rinomina automatica
 adjustContrast.title=Regola il contrasto
 adjustContrast.header=Regola il contrasto
 adjustContrast.contrast=Contrasto:
-adjustContrast.brightness=Luminosità:
+adjustContrast.brightness=Luminosità:
 adjustContrast.saturation=Saturazione:
 adjustContrast.download=Download
 
@@ -826,13 +958,13 @@ crop.submit=Invia
 #autoSplitPDF
 autoSplitPDF.title=PDF diviso automaticamente
 autoSplitPDF.header=PDF diviso automaticamente
-autoSplitPDF.description=Stampa, inserisci, scansiona, carica e lasciaci separare automaticamente i tuoi documenti. Non è necessario alcuno smistamento manuale.
+autoSplitPDF.description=Stampa, inserisci, scansiona, carica e lasciaci separare automaticamente i tuoi documenti. Non è necessario alcuno smistamento manuale.
 autoSplitPDF.selectText.1=Stampa alcuni fogli divisori dal basso (il bianco e nero va bene).
 autoSplitPDF.selectText.2=Scansiona tutti i tuoi documenti contemporaneamente inserendo il foglio divisorio tra di loro.
 autoSplitPDF.selectText.3=Carica il singolo file PDF scansionato di grandi dimensioni e lascia che Stirling PDF gestisca il resto.
 autoSplitPDF.selectText.4=Le pagine divisorie vengono rilevate e rimosse automaticamente, garantendo un documento finale ordinato.
 autoSplitPDF.formPrompt=Invia PDF contenente divisori di pagina Stirling-PDF:
-autoSplitPDF.duplexMode=Modalità duplex (scansione fronte e retro)
+autoSplitPDF.duplexMode=Modalità duplex (scansione fronte e retro)
 autoSplitPDF.dividerDownload2=Scarica 'Divisore automatico (con istruzioni).pdf'
 autoSplitPDF.submit=Invia
 
@@ -862,7 +994,7 @@ scalePages.submit=Invia
 certSign.title=Firma del certificato
 certSign.header=Firma un PDF con il tuo certificato (Lavoro in corso)
 certSign.selectPDF=Seleziona un file PDF per la firma:
-certSign.jksNote=Nota: se il tipo di certificato non è elencato di seguito, convertilo in un file Java Keystore (.jks) utilizzando lo strumento da riga di comando keytool. Quindi, scegli l'opzione del file .jks di seguito.
+certSign.jksNote=Nota: se il tipo di certificato non è elencato di seguito, convertilo in un file Java Keystore (.jks) utilizzando lo strumento da riga di comando keytool. Quindi, scegli l'opzione del file .jks di seguito.
 certSign.selectKey=Seleziona il file della tua chiave privata (formato PKCS#8, potrebbe essere .pem o .der):
 certSign.selectCert=Seleziona il tuo file di certificato (formato X.509, potrebbe essere .pem o .der):
 certSign.selectP12=Selezionare il file keystore PKCS#12 (.p12 o .pfx) (facoltativo, se fornito, dovrebbe contenere la chiave privata e il certificato):
@@ -950,7 +1082,7 @@ flatten.submit=Appiattisci
 
 #ScannerImageSplit
 ScannerImageSplit.selectText.1=Soglia angolo:
-ScannerImageSplit.selectText.2=Imposta il minimo angolo richiesto perché l'immagine venga ruotata (default: 10).
+ScannerImageSplit.selectText.2=Imposta il minimo angolo richiesto perché l'immagine venga ruotata (default: 10).
 ScannerImageSplit.selectText.3=Tolleranza:
 ScannerImageSplit.selectText.4=Imposta lo spettro di colori attorno al colore di sfondo stimato (default: 30).
 ScannerImageSplit.selectText.5=Area minima:
@@ -959,7 +1091,7 @@ ScannerImageSplit.selectText.7=Area di contorno minima:
 ScannerImageSplit.selectText.8=Imposta l'area minima del contorno di una foto
 ScannerImageSplit.selectText.9=Spessore bordo:
 ScannerImageSplit.selectText.10=Imposta lo spessore del bordo aggiunto o rimosso per prevenire bordi bianchi nel risultato (predefinito: 1).
-ScannerImageSplit.info=Python non è installato. È necessario per l'esecuzione.
+ScannerImageSplit.info=Python non è installato. È necessario per l'esecuzione.
 
 
 #OCR
@@ -972,11 +1104,11 @@ ocr.selectText.4=Pulisci il foglio in modo da evitare errori nella lettura. (non
 ocr.selectText.5=Pulisci il foglio in modo da evitare errori nella lettura. (cambia il risultato)
 ocr.selectText.6=Ignora pagine che contengono testo interattivo, scansiona solo pagine che contengono immagini
 ocr.selectText.7=Forza scansione, scansiona ogni pagina rimuovendo gli elementi originali
-ocr.selectText.8=Normale (Darà errore se il PDF contiene testo)
+ocr.selectText.8=Normale (Darà errore se il PDF contiene testo)
 ocr.selectText.9=Impostazioni extra
-ocr.selectText.10=Modalità OCR
+ocr.selectText.10=Modalità OCR
 ocr.selectText.11=Rimuovi immagini dopo la scansione (Rimuove TUTTE le immagini, utile solo come parte del processo di conversione)
-ocr.selectText.12=Modalità di rendering (avanzato)
+ocr.selectText.12=Modalità di rendering (avanzato)
 ocr.help=Per favore leggi la documentazione su come usare il programma per altri linguaggi e/o uso non in Docker
 ocr.credit=Questo servizio utilizza Qpdf e Tesseract per l'OCR.
 ocr.submit=Scansiona testo nel PDF con OCR
@@ -1005,9 +1137,9 @@ compress.header=Comprimi PDF
 compress.credit=Questo servizio utilizza qpdf per la compressione/ottimizzazione dei PDF.
 compress.grayscale.label=Applica scala di grigio per la compressione
 compress.selectText.1=Impostazioni di compressione
-compress.selectText.1.1=1-3 Compressione PDF,</br> 4-6 Compressione immagine leggera,</br> 7-9 Compressione immagine intensa Ridurrà drasticamente la qualità dell'immagine
+compress.selectText.1.1=1-3 Compressione PDF,</br> 4-6 Compressione immagine leggera,</br> 7-9 Compressione immagine intensa Ridurrà drasticamente la qualità dell'immagine
 compress.selectText.2=Livello di ottimizzazione:
-compress.selectText.4=Modalità automatica - Regola automaticamente la qualità per ottenere le dimensioni esatte del PDF
+compress.selectText.4=Modalità automatica - Regola automaticamente la qualità per ottenere le dimensioni esatte del PDF
 compress.selectText.5=Dimensioni PDF previste (ad es. 25 MB, 10,8 MB, 25 KB)
 compress.submit=Comprimi
 
@@ -1022,7 +1154,7 @@ addImage.submit=Aggiungi immagine
 
 #merge
 merge.title=Unisci
-merge.header=Unisci 2 o più PDF
+merge.header=Unisci 2 o più PDF
 merge.sortByName=Ordina per nome
 merge.sortByDate=Ordina per data
 merge.removeCertSign=Rimuovere la firma digitale nel file unito?
@@ -1033,7 +1165,7 @@ merge.submit=Unisci
 pdfOrganiser.title=Organizza pagine
 pdfOrganiser.header=Organizza le pagine di un PDF
 pdfOrganiser.submit=Riordina pagine
-pdfOrganiser.mode=Modalità
+pdfOrganiser.mode=Modalità
 pdfOrganiser.mode.1=Ordine delle pagine personalizzato
 pdfOrganiser.mode.2=Ordine inverso
 pdfOrganiser.mode.3=Ordinamento fronte-retro
@@ -1074,17 +1206,17 @@ multiTool.undo=Annulla
 multiTool.redo=Rifai
 
 #decrypt
-decrypt.passwordPrompt=Questo file è protetto da password. Inserisci la password:
+decrypt.passwordPrompt=Questo file è protetto da password. Inserisci la password:
 decrypt.cancelled=Operazione annullata per il PDF: {0}
 decrypt.noPassword=Nessuna password fornita per il PDF crittografato: {0}
 decrypt.invalidPassword=Riprova con la password corretta.
 decrypt.invalidPasswordHeader=Password errata o crittografia non supportata per il PDF: {0}
-decrypt.unexpectedError=Si è verificato un errore durante l'elaborazione del file. Riprova..
+decrypt.unexpectedError=Si è verificato un errore durante l'elaborazione del file. Riprova..
 decrypt.serverError=Errore del server durante la decrittazione: {0}
 decrypt.success=File decrittografato con successo.
 
 #multiTool-advert
-multiTool-advert.message=Questa funzione è disponibile anche nella nostra <a href="{0}">pagina multi-strumento</a>. Scoprila per un'interfaccia utente pagina per pagina migliorata e funzionalità aggiuntive!
+multiTool-advert.message=Questa funzione è disponibile anche nella nostra <a href="{0}">pagina multi-strumento</a>. Scoprila per un'interfaccia utente pagina per pagina migliorata e funzionalità aggiuntive!
 
 #view pdf
 viewPdf.title=Visualizza/Modifica PDF
@@ -1129,7 +1261,7 @@ imageToPDF.fillPage=Riempi la pagina
 imageToPDF.fitDocumentToImage=Adatta la pagina all'immagine
 imageToPDF.maintainAspectRatio=Mantieni le proporzioni
 imageToPDF.selectText.2=Ruota automaticamente PDF
-imageToPDF.selectText.3=Logica multi-file (funziona solo se ci sono più immagini)
+imageToPDF.selectText.3=Logica multi-file (funziona solo se ci sono più immagini)
 imageToPDF.selectText.4=Unisci in un unico PDF
 imageToPDF.selectText.5=Converti in PDF separati
 
@@ -1140,13 +1272,13 @@ pdfToImage.header=PDF a immagine
 pdfToImage.selectText=Formato immagini
 pdfToImage.singleOrMultiple=Tipo di immagine
 pdfToImage.single=Unica immagine larga
-pdfToImage.multi=Più immagini
+pdfToImage.multi=Più immagini
 pdfToImage.colorType=Tipo di colore
 pdfToImage.color=A colori
 pdfToImage.grey=Scala di grigi
 pdfToImage.blackwhite=Bianco e Nero (potresti perdere dettagli!)
 pdfToImage.submit=Converti
-pdfToImage.info=Python non è installato.È richiesto per la conversione WebP.
+pdfToImage.info=Python non è installato.È richiesto per la conversione WebP.
 pdfToImage.placeholder=(es. 1,2,8 o 4,7,12-16 o 2n-1)
 
 
@@ -1156,11 +1288,11 @@ addPassword.header=Aggiungi password (crittografa)
 addPassword.selectText.1=Seleziona PDF da crittografare
 addPassword.selectText.2=Password
 addPassword.selectText.3=Lunghezza chiave
-addPassword.selectText.4=Valori più grandi sono più sicuri, ma valori più piccoli offrono una compatibilità maggiore.
+addPassword.selectText.4=Valori più grandi sono più sicuri, ma valori più piccoli offrono una compatibilità maggiore.
 addPassword.selectText.5=Permessi
 addPassword.selectText.6=Previeni assemblaggio del documento
 addPassword.selectText.7=Previeni estrazione del contenuto
-addPassword.selectText.8=Previeni estrazione per accessibilità
+addPassword.selectText.8=Previeni estrazione per accessibilità
 addPassword.selectText.9=Previeni compilazione dei moduli
 addPassword.selectText.10=Previeni modifiche
 addPassword.selectText.11=Previeni annotazioni
@@ -1182,7 +1314,7 @@ watermark.selectText.3=Dimensione carattere:
 watermark.selectText.4=Rotazione (0-360):
 watermark.selectText.5=spazio orizzontale (tra ogni filigrana):
 watermark.selectText.6=spazio verticale (tra ogni filigrana):
-watermark.selectText.7=Opacità (0% - 100%):
+watermark.selectText.7=Opacità (0% - 100%):
 watermark.selectText.8=Tipo di filigrana:
 watermark.selectText.9=Immagine filigrana:
 watermark.selectText.10=Converti PDF in PDF-Immagine
@@ -1194,12 +1326,12 @@ watermark.type.2=Immagine
 #Change permissions
 permissions.title=Cambia Permessi
 permissions.header=Cambia permessi
-permissions.warning=Attenzione: per avere questi permessi non modificabili è raccomandabile impostarli attraverso una password
+permissions.warning=Attenzione: per avere questi permessi non modificabili è raccomandabile impostarli attraverso una password
 permissions.selectText.1=Seleziona PDF a cui cambiare permessi
 permissions.selectText.2=Permessi da impostare
 permissions.selectText.3=Previeni assemblaggio del documento
 permissions.selectText.4=Previeni estrazione del contenuto
-permissions.selectText.5=Previeni estrazione per accessibilità
+permissions.selectText.5=Previeni estrazione per accessibilità
 permissions.selectText.6=Previeni compilazione dei moduli
 permissions.selectText.7=Previeni modifiche
 permissions.selectText.8=Previeni annotazioni
@@ -1218,10 +1350,10 @@ removePassword.submit=Rimuovi Password
 
 #changeMetadata
 changeMetadata.title=Titolo:
-changeMetadata.header=Cambia Proprietà
+changeMetadata.header=Cambia Proprietà
 changeMetadata.selectText.1=Imposta i dati che vuoi cambiare
-changeMetadata.selectText.2=Cancella tutte le proprietà
-changeMetadata.selectText.3=Visualizza proprietà personalizzate:
+changeMetadata.selectText.2=Cancella tutte le proprietà
+changeMetadata.selectText.3=Visualizza proprietà personalizzate:
 changeMetadata.author=Autore:
 changeMetadata.creationDate=Data di creazione (yyyy/MM/dd HH:mm:ss):
 changeMetadata.creator=Creatore:
@@ -1230,9 +1362,9 @@ changeMetadata.modDate=Data di modifica (yyyy/MM/dd HH:mm:ss):
 changeMetadata.producer=Produttore:
 changeMetadata.subject=Oggetto:
 changeMetadata.trapped=Recuperato:
-changeMetadata.selectText.4=Altre proprietà:
-changeMetadata.selectText.5=Aggiungi proprietà personalizzata:
-changeMetadata.submit=Cambia proprietà
+changeMetadata.selectText.4=Altre proprietà:
+changeMetadata.selectText.5=Aggiungi proprietà personalizzata:
+changeMetadata.submit=Cambia proprietà
 
 #unlockPDFForms
 unlockPDFForms.title=Rimuovi la sola lettura dai campi del modulo
@@ -1244,9 +1376,9 @@ pdfToPDFA.title=Da PDF a PDF/A
 pdfToPDFA.header=Da PDF a PDF/A
 pdfToPDFA.credit=Questo servizio utilizza libreoffice per la conversione in PDF/A.
 pdfToPDFA.submit=Converti
-pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente
+pdfToPDFA.tip=Attualmente non funziona per più input contemporaneamente
 pdfToPDFA.outputFormat=Formato di output
-pdfToPDFA.pdfWithDigitalSignature=Il PDF contiene una firma digitale. Questo verrà rimosso nel passaggio successivo.
+pdfToPDFA.pdfWithDigitalSignature=Il PDF contiene una firma digitale. Questo verrà rimosso nel passaggio successivo.
 
 
 #PDFToWord
@@ -1308,11 +1440,11 @@ split-by-size-or-count.submit=Separa
 overlay-pdfs.header=Invia file PDF in sovrapposizione
 overlay-pdfs.baseFile.label=Seleziona File PDF di base
 overlay-pdfs.overlayFiles.label=Seleziona sovrapposizione file PDF
-overlay-pdfs.mode.label=Seleziona la modalità di sovrapposizione
+overlay-pdfs.mode.label=Seleziona la modalità di sovrapposizione
 overlay-pdfs.mode.sequential=Sovrapposizione sequenziale
 overlay-pdfs.mode.interleaved=Sovrapposizione interfogliata
 overlay-pdfs.mode.fixedRepeat=Risolto il problema con la ripetizione della sovrapposizione
-overlay-pdfs.counts.label=Numeri sovrapposti (per la modalità di ripetizione fissa)
+overlay-pdfs.counts.label=Numeri sovrapposti (per la modalità di ripetizione fissa)
 overlay-pdfs.counts.placeholder=Inserisci i numeri separati da virgole (ad esempio, 2,3,1)
 overlay-pdfs.position.label=Seleziona posizione di sovrapposizione
 overlay-pdfs.position.foreground=Primo piano
@@ -1351,16 +1483,16 @@ licenses.license=Licenza
 survey.nav=Sondaggio
 survey.title=Sondaggio Stirling-PDF
 survey.description=Stirling-PDF non fa tracciamento, quindi vogliamo sentire i nostri utenti per migliorare Stirling-PDF!
-survey.changes=Stirling-PDF è cambiato dall'ultimo sondaggio! Per saperne di più, consulta il nostro blog qui:
+survey.changes=Stirling-PDF è cambiato dall'ultimo sondaggio! Per saperne di più, consulta il nostro blog qui:
 survey.changes2=Con questi cambiamenti stiamo ricevendo supporto aziendale e finanziamenti retribuiti
-survey.please=Ti invitiamo a prendere in considerazione la possibilità di partecipare al nostro sondaggio!
-survey.disabled=(Il popup del sondaggio verrà disabilitato nei prossimi aggiornamenti ma sarà disponibile a piè di pagina)
+survey.please=Ti invitiamo a prendere in considerazione la possibilità di partecipare al nostro sondaggio!
+survey.disabled=(Il popup del sondaggio verrà disabilitato nei prossimi aggiornamenti ma sarà disponibile a piè di pagina)
 survey.button=Partecipa al sondaggio
-survey.dontShowAgain=Non mostrare più
+survey.dontShowAgain=Non mostrare più
 survey.meeting.1=Se utilizzi Stirling PDF al lavoro, saremo lieti di parlare con te. Offriamo sessioni di supporto tecnico in cambio di una sessione di individuazione dell'utente di 15 minuti.
-survey.meeting.2=Questa è un'opportunità per:
+survey.meeting.2=Questa è un'opportunità per:
 survey.meeting.3=Ottenere assistenza per la distribuzione, le integrazioni o la risoluzione dei problemi
-survey.meeting.4=Fornire feedback diretto su prestazioni, casi limite e lacune nelle funzionalità
+survey.meeting.4=Fornire feedback diretto su prestazioni, casi limite e lacune nelle funzionalità
 survey.meeting.5=Aiutaci a perfezionare Stirling PDF per un utilizzo aziendale nel mondo reale
 survey.meeting.6=Se sei interessato, puoi prenotare un appuntamento direttamente con il nostro team. (Solo in inglese)
 survey.meeting.7=Non vediamo l'ora di approfondire i tuoi casi d'uso e di migliorare ulteriormente Stirling PDF!
@@ -1373,7 +1505,7 @@ error.needHelp=Hai bisogno di aiuto / trovato un problema?
 error.contactTip=Se i problemi persistono, non esitare a contattarci per chiedere aiuto. Puoi aprire un ticket sulla nostra pagina GitHub o contattarci tramite Discord:
 error.404.head=404 - Pagina non trovata | Spiacenti, siamo inciampati nel codice!
 error.404.1=Non riusciamo a trovare la pagina che stai cercando.
-error.404.2=Qualcosa è andato storto
+error.404.2=Qualcosa è andato storto
 error.github=Apri un ticket su GitHub
 error.showStack=Mostra traccia dello stack
 error.copyStack=Copia traccia dello stack
@@ -1393,10 +1525,10 @@ splitByChapters.header=Dividi PDF per capitoli
 splitByChapters.bookmarkLevel=Livello segnalibro
 splitByChapters.includeMetadata=Includi Metadati
 splitByChapters.allowDuplicates=Consenti duplicati
-splitByChapters.desc.1=Questo strumento divide un file PDF in più PDF in base alla struttura dei capitoli.
+splitByChapters.desc.1=Questo strumento divide un file PDF in più PDF in base alla struttura dei capitoli.
 splitByChapters.desc.2=Livello segnalibro: seleziona il livello dei segnalibri da utilizzare per la suddivisione (0 per il livello superiore, 1 per il secondo livello, ecc.).
 splitByChapters.desc.3=Includi metadati: se selezionato, i metadati del PDF originale verranno inclusi in ogni PDF diviso.
-splitByChapters.desc.4=Consenti duplicati: se selezionata, consente più segnalibri sulla stessa pagina per creare PDF separati.
+splitByChapters.desc.4=Consenti duplicati: se selezionata, consente più segnalibri sulla stessa pagina per creare PDF separati.
 splitByChapters.submit=Dividi PDF
 
 #File Chooser
@@ -1429,13 +1561,13 @@ validateSignature.location=Posizione
 validateSignature.noSignatures=Nessuna firma digitale trovata in questo documento
 validateSignature.status.valid=Valida
 validateSignature.status.invalid=Invalida
-validateSignature.chain.invalid=Convalida della catena di certificati non riuscita: impossibile verificare l'identità del firmatario
-validateSignature.trust.invalid=Certificato non presente nell'archivio attendibile: la fonte non può essere verificata
-validateSignature.cert.expired=Il certificato è scaduto
-validateSignature.cert.revoked=Il certificato è stato revocato
+validateSignature.chain.invalid=Convalida della catena di certificati non riuscita: impossibile verificare l'identità del firmatario
+validateSignature.trust.invalid=Certificato non presente nell'archivio attendibile: la fonte non può essere verificata
+validateSignature.cert.expired=Il certificato è scaduto
+validateSignature.cert.revoked=Il certificato è stato revocato
 validateSignature.signature.info=Informazioni sulla firma
 validateSignature.signature=Firma
-validateSignature.signature.mathValid=La firma è matematicamente valida MA:
+validateSignature.signature.mathValid=La firma è matematicamente valida MA:
 validateSignature.selectCustomCert=File di certificato personalizzato X.509 (opzionale)
 validateSignature.cert.info=Dettagli del certificato
 validateSignature.cert.issuer=Emittente
@@ -1454,7 +1586,7 @@ validateSignature.cert.bits=bit
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=Come utilizziamo i cookie
-cookieBanner.popUp.description.1=Utilizziamo cookie e altre tecnologie per migliorare l'esperienza utente di Stirling PDF, aiutandoci a perfezionare i nostri strumenti e a continuare a sviluppare funzionalità che amerai.
+cookieBanner.popUp.description.1=Utilizziamo cookie e altre tecnologie per migliorare l'esperienza utente di Stirling PDF, aiutandoci a perfezionare i nostri strumenti e a continuare a sviluppare funzionalità che amerai.
 cookieBanner.popUp.description.2=Se preferisci non farlo, cliccando su "No grazie" verranno abilitati solo i cookie essenziali, necessari per il corretto funzionamento del sito.
 cookieBanner.popUp.acceptAllBtn=Acconsento
 cookieBanner.popUp.acceptNecessaryBtn=No grazie
@@ -1466,12 +1598,47 @@ cookieBanner.preferencesModal.savePreferencesBtn=Salva preferenze
 cookieBanner.preferencesModal.closeIconLabel=Chiusura modale
 cookieBanner.preferencesModal.serviceCounterLabel=Servizio|Servizi
 cookieBanner.preferencesModal.subtitle=Utilizzo dei cookie
-cookieBanner.preferencesModal.description.1=Stirling PDF utilizza cookie e tecnologie simili per migliorare la tua esperienza e comprendere come vengono utilizzati i nostri strumenti. Questo ci aiuta a migliorare le prestazioni, a sviluppare le funzionalità che ti interessano e a fornire supporto continuo ai nostri utenti.
-cookieBanner.preferencesModal.description.2=Stirling PDF non può e non potrà mai tracciare o accedere al contenuto dei documenti che utilizzi.
+cookieBanner.preferencesModal.description.1=Stirling PDF utilizza cookie e tecnologie simili per migliorare la tua esperienza e comprendere come vengono utilizzati i nostri strumenti. Questo ci aiuta a migliorare le prestazioni, a sviluppare le funzionalità che ti interessano e a fornire supporto continuo ai nostri utenti.
+cookieBanner.preferencesModal.description.2=Stirling PDF non può e non potrà mai tracciare o accedere al contenuto dei documenti che utilizzi.
 cookieBanner.preferencesModal.description.3=La tua privacy e la tua fiducia sono al centro del nostro operato.
 cookieBanner.preferencesModal.necessary.title.1=Cookie strettamente necessari
 cookieBanner.preferencesModal.necessary.title.2=Sempre abilitati
-cookieBanner.preferencesModal.necessary.description=Questi cookie sono essenziali per il corretto funzionamento del sito web. Abilitano funzionalità fondamentali come l'impostazione delle preferenze sulla privacy, l'accesso e la compilazione di moduli, motivo per cui non possono essere disattivati.
+cookieBanner.preferencesModal.necessary.description=Questi cookie sono essenziali per il corretto funzionamento del sito web. Abilitano funzionalità fondamentali come l'impostazione delle preferenze sulla privacy, l'accesso e la compilazione di moduli, motivo per cui non possono essere disattivati.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=Questi cookie ci aiutano a capire come vengono utilizzati i nostri strumenti, così possiamo concentrarci sullo sviluppo delle funzionalità che la nostra community apprezza di più. Non preoccuparti: Stirling PDF non può e non traccerà mai il contenuto dei documenti con cui lavori.
+cookieBanner.preferencesModal.analytics.description=Questi cookie ci aiutano a capire come vengono utilizzati i nostri strumenti, così possiamo concentrarci sullo sviluppo delle funzionalità che la nostra community apprezza di più. Non preoccuparti: Stirling PDF non può e non traccerà mai il contenuto dei documenti con cui lavori.
 
+#fakeScan
+fakeScan.title=Falsa scansione
+fakeScan.header=Falsa scansione
+fakeScan.description=Crea un PDF che sembra scansionato
+fakeScan.selectPDF=Seleziona PDF:
+fakeScan.quality=Qualità di scansione
+fakeScan.quality.low=Bassa
+fakeScan.quality.medium=Media
+fakeScan.quality.high=Alta
+fakeScan.rotation=Angolo di rotazione
+fakeScan.rotation.none=Nessuno
+fakeScan.rotation.slight=Lieve
+fakeScan.rotation.moderate=Moderato
+fakeScan.rotation.severe=Severo
+fakeScan.submit=Crea una falsa scansione
+
+#home.fakeScan
+home.fakeScan.title=Falsa scansione
+home.fakeScan.desc=Crea un PDF che sembra scansionato
+fakeScan.tags=scansiona, simula, realistico, converti
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Abilita impostazioni di scansione avanzate
+fakeScan.colorspace=Spazio colore
+fakeScan.colorspace.grayscale=Scala di grigi
+fakeScan.colorspace.color=Colore
+fakeScan.border=Bordo (px)
+fakeScan.rotate=Rotazione di base (gradi)
+fakeScan.rotateVariance=Varianza di rotazione (gradi)
+fakeScan.brightness=Luminosità
+fakeScan.contrast=Contrasto
+fakeScan.blur=Sfocatura
+fakeScan.noise=Rumore
+fakeScan.yellowish=Giallastro (simula carta vecchia)
+fakeScan.resolution=Risoluzione (DPI)

stirling-pdf/src/main/resources/messages_nl_NL.properties

@@ -3,6 +3,138 @@
 ###########
 # the direction that the language is written (ltr = left to right, rtl = right to left)
 language.direction=ltr
+
+# Language names for reuse throughout the application
+lang.afr=Afrikaans
+lang.amh=Amharic
+lang.ara=Arabic
+lang.asm=Assamese
+lang.aze=Azerbaijani
+lang.aze_cyrl=Azerbaijani (Cyrillic)
+lang.bel=Belarusian
+lang.ben=Bengali
+lang.bod=Tibetan
+lang.bos=Bosnian
+lang.bre=Breton
+lang.bul=Bulgarian
+lang.cat=Catalan
+lang.ceb=Cebuano
+lang.ces=Czech
+lang.chi_sim=Chinese (Simplified)
+lang.chi_sim_vert=Chinese (Simplified, Vertical)
+lang.chi_tra=Chinese (Traditional)
+lang.chi_tra_vert=Chinese (Traditional, Vertical)
+lang.chr=Cherokee
+lang.cos=Corsican
+lang.cym=Welsh
+lang.dan=Danish
+lang.dan_frak=Danish (Fraktur)
+lang.deu=German
+lang.deu_frak=German (Fraktur)
+lang.div=Divehi
+lang.dzo=Dzongkha
+lang.ell=Greek
+lang.eng=English
+lang.enm=English, Middle (1100-1500)
+lang.epo=Esperanto
+lang.equ=Math / equation detection module
+lang.est=Estonian
+lang.eus=Basque
+lang.fao=Faroese
+lang.fas=Persian
+lang.fil=Filipino
+lang.fin=Finnish
+lang.fra=French
+lang.frk=Frankish
+lang.frm=French, Middle (ca.1400-1600)
+lang.fry=Western Frisian
+lang.gla=Scottish Gaelic
+lang.gle=Irish
+lang.glg=Galician
+lang.grc=Ancient Greek
+lang.guj=Gujarati
+lang.hat=Haitian, Haitian Creole
+lang.heb=Hebrew
+lang.hin=Hindi
+lang.hrv=Croatian
+lang.hun=Hungarian
+lang.hye=Armenian
+lang.iku=Inuktitut
+lang.ind=Indonesian
+lang.isl=Icelandic
+lang.ita=Italian
+lang.ita_old=Italian (Old)
+lang.jav=Javanese
+lang.jpn=Japanese
+lang.jpn_vert=Japanese (Vertical)
+lang.kan=Kannada
+lang.kat=Georgian
+lang.kat_old=Georgian (Old)
+lang.kaz=Kazakh
+lang.khm=Central Khmer
+lang.kir=Kirghiz, Kyrgyz
+lang.kmr=Northern Kurdish
+lang.kor=Korean
+lang.kor_vert=Korean (Vertical)
+lang.lao=Lao
+lang.lat=Latin
+lang.lav=Latvian
+lang.lit=Lithuanian
+lang.ltz=Luxembourgish
+lang.mal=Malayalam
+lang.mar=Marathi
+lang.mkd=Macedonian
+lang.mlt=Maltese
+lang.mon=Mongolian
+lang.mri=Maori
+lang.msa=Malay
+lang.mya=Burmese
+lang.nep=Nepali
+lang.nld=Dutch; Flemish
+lang.nor=Norwegian
+lang.oci=Occitan (post 1500)
+lang.ori=Oriya
+lang.osd=Orientation and script detection module
+lang.pan=Panjabi, Punjabi
+lang.pol=Polish
+lang.por=Portuguese
+lang.pus=Pushto, Pashto
+lang.que=Quechua
+lang.ron=Romanian, Moldavian, Moldovan
+lang.rus=Russian
+lang.san=Sanskrit
+lang.sin=Sinhala, Sinhalese
+lang.slk=Slovak
+lang.slk_frak=Slovak (Fraktur)
+lang.slv=Slovenian
+lang.snd=Sindhi
+lang.spa=Spanish
+lang.spa_old=Spanish (Old)
+lang.sqi=Albanian
+lang.srp=Serbian
+lang.srp_latn=Serbian (Latin)
+lang.sun=Sundanese
+lang.swa=Swahili
+lang.swe=Swedish
+lang.syr=Syriac
+lang.tam=Tamil
+lang.tat=Tatar
+lang.tel=Telugu
+lang.tgk=Tajik
+lang.tgl=Tagalog
+lang.tha=Thai
+lang.tir=Tigrinya
+lang.ton=Tonga (Tonga Islands)
+lang.tur=Turkish
+lang.uig=Uighur, Uyghur
+lang.ukr=Ukrainian
+lang.urd=Urdu
+lang.uzb=Uzbek
+lang.uzb_cyrl=Uzbek (Cyrillic)
+lang.vie=Vietnamese
+lang.yid=Yiddish
+lang.yor=Yoruba
+
 addPageNumbers.fontSize=Lettertypegrootte
 addPageNumbers.fontName=Lettertypenaam
 pdfPrompt=Selecteer PDF('s)
@@ -164,7 +296,7 @@ navbar.sections.popular=Popular
 #############
 settings.title=Instellingen
 settings.update=Update beschikbaar
-settings.updateAvailable={0} is de huidig geïnstalleerde versie. Een nieuwe versie ({1}) is beschikbaar.
+settings.updateAvailable={0} is de huidig geïnstalleerde versie. Een nieuwe versie ({1}) is beschikbaar.
 settings.appVersion=App versie:
 settings.downloadOption.title=Kies download optie (Voor enkelvoudige bestanddownloads zonder zip):
 settings.downloadOption.1=Open in hetzelfde venster
@@ -310,7 +442,7 @@ home.multiTool.desc=Pagina's samenvoegen, draaien, herschikken en verwijderen
 multiTool.tags=Multitool,meerdere bewerkingen,UI,klik sleep,voorkant,clientzijde,interactief,beweegbaar,verplaats
 
 home.merge.title=Samenvoegen
-home.merge.desc=Voeg eenvoudig meerdere PDF's samen tot één.
+home.merge.desc=Voeg eenvoudig meerdere PDF's samen tot één.
 merge.tags=samenvoegen,pagina bewerkingen,serverzijde
 
 home.split.title=Splitsen
@@ -446,7 +578,7 @@ home.removeCertSign.desc=Verwijder certificaat van PDF
 removeCertSign.tags=authenticeren,PEM,P12,officieel,ontsleutelen
 
 home.pageLayout.title=Multi-pagina indeling
-home.pageLayout.desc=Voeg meerdere pagina's van een PDF-document samen op één pagina
+home.pageLayout.desc=Voeg meerdere pagina's van een PDF-document samen op één pagina
 pageLayout.tags=samenvoegen,composiet,enkel-zicht,organiseren
 
 home.scalePages.title=Aanpassen paginaformaat/schaal
@@ -454,7 +586,7 @@ home.scalePages.desc=Wijzig de grootte/schaal van een pagina en/of de inhoud erv
 scalePages.tags=resize,aanpassen,dimensie,aanpassen
 
 home.pipeline.title=Pijplijn
-home.pipeline.desc=Voer meerdere acties uit op PDF's door pipelinescripts te definiëren
+home.pipeline.desc=Voer meerdere acties uit op PDF's door pipelinescripts te definiëren
 pipeline.tags=automatiseren,volgorde,gescrript,batch-verwerking
 
 home.add-page-numbers.title=Paginanummers toevoegen
@@ -524,13 +656,13 @@ home.extractPage.desc=Extraheert geselecteerde pagina's uit PDF
 extractPage.tags=extraheren
 
 
-home.PdfToSinglePage.title=PDF naar één grote pagina
-home.PdfToSinglePage.desc=Voegt alle PDF-pagina's samen tot één grote pagina
-PdfToSinglePage.tags=één pagina
+home.PdfToSinglePage.title=PDF naar één grote pagina
+home.PdfToSinglePage.desc=Voegt alle PDF-pagina's samen tot één grote pagina
+PdfToSinglePage.tags=één pagina
 
 
 home.showJS.title=Toon Javascript
-home.showJS.desc=Zoekt en toont ieder script dat in een PDF is geïnjecteerd
+home.showJS.desc=Zoekt en toont ieder script dat in een PDF is geïnjecteerd
 showJS.tags=JS
 
 home.autoRedact.title=Automatisch censureren
@@ -768,8 +900,8 @@ AddStampRequest.fontSize=Tekst/afbeelding grootte
 AddStampRequest.rotation=Rotatie
 AddStampRequest.opacity=Transparantie
 AddStampRequest.position=Positie
-AddStampRequest.overrideX=X coördinaat overschrijven
-AddStampRequest.overrideY=Y coördinaat overschrijven
+AddStampRequest.overrideX=X coördinaat overschrijven
+AddStampRequest.overrideY=Y coördinaat overschrijven
 AddStampRequest.customMargin=Aangepaste marge
 AddStampRequest.customColor=Aangepaste tekstkleur
 AddStampRequest.submit=Indienen
@@ -863,12 +995,12 @@ certSign.title=Certificaat ondertekening
 certSign.header=Onderteken een PDF met je certificaat (in ontwikkeling)
 certSign.selectPDF=Selecteer een PDF-bestand voor ondertekening:
 certSign.jksNote=Let op: als het certificaattype hieronder niet staat, converteer het dan naar een Java Keystore (.jks) bestand met de keytool command line tool. Kies vervolgens de .jks bestandsoptie.
-certSign.selectKey=Selecteer je privésleutelbestand (PKCS#8 formaat, kan .pem of .der zijn):
+certSign.selectKey=Selecteer je privésleutelbestand (PKCS#8 formaat, kan .pem of .der zijn):
 certSign.selectCert=Selecteer je certificaatbestand (X.509 formaat, kan .pem of .der zijn):
-certSign.selectP12=Selecteer je PKCS#12 Sleutelopslagbestand (.p12 of .pfx) (Optioneel, indien verstrekt, moet het je privésleutel en certificaat bevatten):
+certSign.selectP12=Selecteer je PKCS#12 Sleutelopslagbestand (.p12 of .pfx) (Optioneel, indien verstrekt, moet het je privésleutel en certificaat bevatten):
 certSign.selectJKS=Selecteer je Java Keystore bestand (.jks of .keystore):
 certSign.certType=Certificaattype
-certSign.password=Voer je sleutelopslag of privésleutel wachtwoord in (indien van toepassing):
+certSign.password=Voer je sleutelopslag of privésleutel wachtwoord in (indien van toepassing):
 certSign.showSig=Toon handtekening
 certSign.reason=Reden
 certSign.location=Locatie
@@ -908,8 +1040,8 @@ compare.highlightColor.2=Hervormingskleur 2:
 compare.document.1=Document 1
 compare.document.2=Document 2
 compare.submit=Vergelijken
-compare.complex.message=Eén of beide van de bijgewerkte documenten zijn grote bestanden, het vergelijken kan mogelijk minder nauwkeurig zijn.
-compare.large.file.message=Eén of beiden van de bijgewerkte documenten zijn te groot om verwerkt te worden.
+compare.complex.message=Eén of beide van de bijgewerkte documenten zijn grote bestanden, het vergelijken kan mogelijk minder nauwkeurig zijn.
+compare.large.file.message=Eén of beiden van de bijgewerkte documenten zijn te groot om verwerkt te worden.
 compare.no.text.message=Een of beide geselecteerde PDF-bestanden bevatten geen tekstinhoud. Kies a.u.b. PDF-bestanden met tekst voor vergelijking.
 
 #sign
@@ -959,7 +1091,7 @@ ScannerImageSplit.selectText.7=Minimum contour oppervlakte:
 ScannerImageSplit.selectText.8=Stelt de minimale contour oppervlakte drempel in voor een foto
 ScannerImageSplit.selectText.9=Randgrootte:
 ScannerImageSplit.selectText.10=Stelt de grootte van de toegevoegde en verwijderde rand in om witte randen in de uitvoer te voorkomen (standaard: 1).
-ScannerImageSplit.info=Python is niet geïnstalleerd. Het wordt vereist om te worden uitgevoerd.
+ScannerImageSplit.info=Python is niet geïnstalleerd. Het wordt vereist om te worden uitgevoerd.
 
 
 #OCR
@@ -985,7 +1117,7 @@ ocr.submit=Verwerk PDF met OCR
 #extractImages
 extractImages.title=Afbeeldingen extraheren
 extractImages.header=Afbeeldingen extraheren
-extractImages.selectText=Selecteer het beeldformaat voor geëxtraheerde afbeeldingen
+extractImages.selectText=Selecteer het beeldformaat voor geëxtraheerde afbeeldingen
 extractImages.allowDuplicates=Dubbele afbeeldingen opslaan
 extractImages.submit=Extraheer
 
@@ -1130,7 +1262,7 @@ imageToPDF.fitDocumentToImage=Pagina passend maken voor afbeelding
 imageToPDF.maintainAspectRatio=Beeldverhoudingen behouden
 imageToPDF.selectText.2=PDF automatisch draaien
 imageToPDF.selectText.3=Meervoudige bestandslogica (Alleen ingeschakeld bij werken met meerdere afbeeldingen)
-imageToPDF.selectText.4=Voeg samen in één PDF
+imageToPDF.selectText.4=Voeg samen in één PDF
 imageToPDF.selectText.5=Zet om naar afzonderlijke PDF's
 
 
@@ -1139,14 +1271,14 @@ pdfToImage.title=PDF naar afbeelding
 pdfToImage.header=PDF naar afbeelding
 pdfToImage.selectText=Afbeeldingsformaat
 pdfToImage.singleOrMultiple=Resultaattype van pagina naar afbeelding
-pdfToImage.single=Eén grote afbeelding die alle pagina's combineert
-pdfToImage.multi=Meerdere afbeeldingen, één afbeelding per pagina
+pdfToImage.single=Eén grote afbeelding die alle pagina's combineert
+pdfToImage.multi=Meerdere afbeeldingen, één afbeelding per pagina
 pdfToImage.colorType=Kleurtype
 pdfToImage.color=Kleur
 pdfToImage.grey=Grijstinten
 pdfToImage.blackwhite=Zwart en wit (kan data verliezen!)
 pdfToImage.submit=Omzetten
-pdfToImage.info=Python is niet geïnstalleerd. Vereist voor WebP-conversie.
+pdfToImage.info=Python is niet geïnstalleerd. Vereist voor WebP-conversie.
 pdfToImage.placeholder=(bijv. 1,2,8 of 4,7,12-16 of 2n-1)
 
 
@@ -1310,7 +1442,7 @@ overlay-pdfs.baseFile.label=Selecteer basis PDF-bestand
 overlay-pdfs.overlayFiles.label=Selecteer overlappende PDF-bestanden
 overlay-pdfs.mode.label=Selecteer overlappingsmodus
 overlay-pdfs.mode.sequential=Sequentieel overlappen
-overlay-pdfs.mode.interleaved=Geïnterlinieerd overlappen
+overlay-pdfs.mode.interleaved=Geïnterlinieerd overlappen
 overlay-pdfs.mode.fixedRepeat=Overlappen met vaste herhaling
 overlay-pdfs.counts.label=Aantal keren overlappen (voor vaste herhalings modus)
 overlay-pdfs.counts.placeholder=Voer door komma's gescheiden aantallen in (bijv., 2,3,1)
@@ -1328,7 +1460,7 @@ split-by-sections.vertical.label=Verticale secties
 split-by-sections.horizontal.placeholder=Voer het aantal horizontale secties in
 split-by-sections.vertical.placeholder=Voer het aantal verticale secties in
 split-by-sections.submit=PDF splitsen
-split-by-sections.merge=Samenvoegen in één PDF
+split-by-sections.merge=Samenvoegen in één PDF
 
 
 #printFile
@@ -1348,14 +1480,14 @@ licenses.version=Versie
 licenses.license=Licentie
 
 #survey
-survey.nav=Enquête
-survey.title=Stirling-PDF Enquête
+survey.nav=Enquête
+survey.title=Stirling-PDF Enquête
 survey.description=Stirling-PDF heeft geen tracking, dus we willen van onze gebruikers horen om Stirling-PDF te verbeteren.
-survey.changes=Stirling-PDF is sinds de laatste enquête veranderd! Zie hier onze blogpost voor meer informatie:
+survey.changes=Stirling-PDF is sinds de laatste enquête veranderd! Zie hier onze blogpost voor meer informatie:
 survey.changes2=Met deze veranderingen krijgen we betaalde bedrijfsondersteuning en financiering
-survey.please=Overweeg alstublieft om onze enquête in te vullen!
-survey.disabled=(Enquête popup wordt in een toekomstige update weggehaald, maar is beschikbaar aan de onderkant van de pagina.)
-survey.button=Vul enquête in.
+survey.please=Overweeg alstublieft om onze enquête in te vullen!
+survey.disabled=(Enquête popup wordt in een toekomstige update weggehaald, maar is beschikbaar aan de onderkant van de pagina.)
+survey.button=Vul enquête in.
 survey.dontShowAgain=Niet weer tonen
 survey.meeting.1=If you're using Stirling PDF at work, we'd love to speak to you. We're offering technical support sessions in exchange for a 15 minute user discovery session.
 survey.meeting.2=This is a chance to:
@@ -1454,8 +1586,8 @@ validateSignature.cert.bits=bits
 #  Cookie banner   #
 ####################
 cookieBanner.popUp.title=How we use Cookies
-cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you—helping us improve our tools and keep building features you'll love.
-cookieBanner.popUp.description.2=If you’d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
+cookieBanner.popUp.description.1=We use cookies and other technologies to make Stirling PDF work better for you?helping us improve our tools and keep building features you'll love.
+cookieBanner.popUp.description.2=If you?d rather not, clicking 'No Thanks' will only enable the essential cookies needed to keep things running smoothly.
 cookieBanner.popUp.acceptAllBtn=Okay
 cookieBanner.popUp.acceptNecessaryBtn=No Thanks
 cookieBanner.popUp.showPreferencesBtn=Manage preferences
@@ -1467,11 +1599,46 @@ cookieBanner.preferencesModal.closeIconLabel=Close modal
 cookieBanner.preferencesModal.serviceCounterLabel=Service|Services
 cookieBanner.preferencesModal.subtitle=Cookie Usage
 cookieBanner.preferencesModal.description.1=Stirling PDF uses cookies and similar technologies to enhance your experience and understand how our tools are used. This helps us improve performance, develop the features you care about, and provide ongoing support to our users.
-cookieBanner.preferencesModal.description.2=Stirling PDF cannot—and will never—track or access the content of the documents you use.
+cookieBanner.preferencesModal.description.2=Stirling PDF cannot?and will never?track or access the content of the documents you use.
 cookieBanner.preferencesModal.description.3=Your privacy and trust are at the core of what we do.
 cookieBanner.preferencesModal.necessary.title.1=Strictly Necessary Cookies
 cookieBanner.preferencesModal.necessary.title.2=Always Enabled
-cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms—which is why they can’t be turned off.
+cookieBanner.preferencesModal.necessary.description=These cookies are essential for the website to function properly. They enable core features like setting your privacy preferences, logging in, and filling out forms?which is why they can?t be turned off.
 cookieBanner.preferencesModal.analytics.title=Analytics
-cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured—Stirling PDF cannot and will never track the content of the documents you work with.
+cookieBanner.preferencesModal.analytics.description=These cookies help us understand how our tools are being used, so we can focus on building the features our community values most. Rest assured?Stirling PDF cannot and will never track the content of the documents you work with.
 
+#fakeScan
+fakeScan.title=Fake Scan
+fakeScan.header=Fake Scan
+fakeScan.description=Create a PDF that looks like it was scanned
+fakeScan.selectPDF=Select PDF:
+fakeScan.quality=Scan Quality
+fakeScan.quality.low=Low
+fakeScan.quality.medium=Medium
+fakeScan.quality.high=High
+fakeScan.rotation=Rotation Angle
+fakeScan.rotation.none=None
+fakeScan.rotation.slight=Slight
+fakeScan.rotation.moderate=Moderate
+fakeScan.rotation.severe=Severe
+fakeScan.submit=Create Fake Scan
+
+#home.fakeScan
+home.fakeScan.title=Fake Scan
+home.fakeScan.desc=Create a PDF that looks like it was scanned
+fakeScan.tags=scan,simulate,realistic,convert
+
+# FakeScan advanced settings (frontend)
+fakeScan.advancedSettings=Enable Advanced Scan Settings
+fakeScan.colorspace=Colorspace
+fakeScan.colorspace.grayscale=Grayscale
+fakeScan.colorspace.color=Color
+fakeScan.border=Border (px)
+fakeScan.rotate=Base Rotation (degrees)
+fakeScan.rotateVariance=Rotation Variance (degrees)
+fakeScan.brightness=Brightness
+fakeScan.contrast=Contrast
+fakeScan.blur=Blur
+fakeScan.noise=Noise
+fakeScan.yellowish=Yellowish (simulate old paper)
+fakeScan.resolution=Resolution (DPI)

stirling-pdf/src/main/resources/static/css/edit-table-of-contents.css

@@ -0,0 +1,276 @@
+/* Main bookmark container styles */
+.bookmark-editor {
+  margin-top: 20px;
+  padding: 20px;
+  border: 1px solid var(--border-color, #ced4da);
+  border-radius: 0.25rem;
+  background-color: var(--bg-container, var(--md-sys-color-surface, #edf0f5));
+}
+
+[data-bs-theme="dark"] .bookmark-editor {
+  --border-color: #495057;
+  --bg-container: var(--md-sys-color-surface, #15202a);
+}
+
+/* Bookmark item styles */
+.bookmark-item {
+  margin-bottom: 12px;
+  border: 1px solid var(--border-item, #e9ecef);
+  border-radius: 0.5rem;
+  background-color: var(--bg-item, var(--md-sys-color-surface-container-lowest, #ffffff));
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+  overflow: hidden;
+}
+
+[data-bs-theme="dark"] .bookmark-item {
+  --border-item: var(--md-sys-color-surface-variant, #444b53);
+  --bg-item: var(--md-sys-color-surface-container-low, #24282e);
+}
+
+/* Bookmark header (collapsible part) */
+.bookmark-header {
+  padding: 12px 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+  background-color: var(--bg-header, var(--md-sys-color-surface-container, #f1f3f5));
+  border-bottom: 1px solid var(--border-header, var(--md-sys-color-outline-variant, #e9ecef));
+  transition: background-color 0.15s ease;
+}
+
+.bookmark-header:hover {
+  background-color: var(--bg-header-hover, var(--md-sys-state-hover-opacity, #e9ecef));
+}
+
+[data-bs-theme="dark"] .bookmark-header {
+  --bg-header: var(--md-sys-color-surface-container-high, #3a424a);
+  --bg-header-hover: var(--md-sys-color-surface-container-highest, #434a52);
+  --border-header: var(--md-sys-color-outline-variant, #444b53);
+}
+
+/* Bookmark content (inside accordion) */
+.bookmark-content {
+  padding: 15px;
+  border-top: 0;
+}
+
+/* Children container */
+.bookmark-children {
+  margin-top: 10px;
+  margin-left: 20px;
+  padding-left: 15px;
+  border-left: 2px solid var(--border-children, #6c757d);
+}
+
+[data-bs-theme="dark"] .bookmark-children {
+  --border-children: #6c757d;
+}
+
+/* Level indicators */
+.bookmark-level-indicator {
+  font-size: 0.8em;
+  color: var(--text-muted, #6c757d);
+  font-weight: 500;
+  text-transform: uppercase;
+  margin-right: 8px;
+}
+
+[data-bs-theme="dark"] .bookmark-level-indicator {
+  --text-muted: #adb5bd;
+}
+
+/* Button styles */
+.btn-bookmark-action {
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  border-radius: 4px;
+  padding: 0;
+  margin-right: 6px;
+  transition: all 0.2s ease;
+  position: relative;
+}
+
+.btn-bookmark-action:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+/* Visual distinction for child vs sibling buttons using theme colors */
+.btn-add-child {
+  background-color: var(--btn-add-child-bg, var(--md-sys-color-surface-container-low, #e9ecef));
+  color: var(--btn-add-child-color, var(--md-nav-section-color-other, #72bd54));
+  border-color: var(--btn-add-child-border, var(--md-nav-section-color-other, #72bd54));
+}
+
+.btn-add-child::after {
+  content: "";
+  position: absolute;
+  left: -2px;
+  top: 50%;
+  width: 5px;
+  height: 1px;
+  background-color: var(--btn-add-child-border, var(--md-nav-section-color-other, #72bd54));
+}
+
+[data-bs-theme="dark"] .btn-add-child {
+  --btn-add-child-bg: var(--md-sys-color-surface-container, #28323a);
+  --btn-add-child-color: var(--favourite-add, #9ed18c);
+  --btn-add-child-border: var(--favourite-add, #9ed18c);
+}
+
+.btn-add-sibling {
+  background-color: var(--btn-add-sibling-bg, var(--md-sys-color-surface-container-low, #e9ecef));
+  color: var(--btn-add-sibling-color, var(--md-sys-color-primary, #0060aa));
+  border-color: var(--btn-add-sibling-border, var(--md-sys-color-primary, #0060aa));
+}
+
+[data-bs-theme="dark"] .btn-add-sibling {
+  --btn-add-sibling-bg: var(--md-sys-color-surface-container, #28323a);
+  --btn-add-sibling-color: var(--md-sys-color-primary, #a2c9ff);
+  --btn-add-sibling-border: var(--md-sys-color-primary, #a2c9ff);
+}
+
+.bookmark-actions-header {
+  display: flex;
+  margin-left: 8px;
+}
+
+.bookmark-actions-content {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px dashed var(--border-subtle-color, #dee2e6);
+}
+
+[data-bs-theme="dark"] .bookmark-actions-content {
+  --border-subtle-color: #495057;
+}
+
+/* Main actions section */
+.bookmark-actions {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-start;
+}
+
+/* Collapse/expand icons */
+.toggle-icon {
+  transition: transform 0.3s ease;
+}
+
+.collapsed .toggle-icon {
+  transform: rotate(-90deg);
+}
+
+/* Title and page display in header */
+.bookmark-title-preview {
+  font-weight: 500;
+  margin-right: 10px;
+  color: var(--text-primary, var(--md-sys-color-on-surface, #212529));
+}
+
+[data-bs-theme="dark"] .bookmark-title-preview {
+  --text-primary: var(--md-sys-color-on-surface, #e9ecef);
+}
+
+.bookmark-page-preview {
+  font-size: 0.9em;
+  color: var(--text-secondary, var(--md-sys-color-on-surface-variant, #6c757d));
+}
+
+[data-bs-theme="dark"] .bookmark-page-preview {
+  --text-secondary: var(--md-sys-color-on-surface-variant, #adb5bd);
+}
+
+/* Input text colors */
+.bookmark-content input, 
+.bookmark-content label {
+  color: var(--input-text, var(--md-sys-color-on-surface, #212529));
+}
+
+[data-bs-theme="dark"] .bookmark-content input,
+[data-bs-theme="dark"] .bookmark-content label {
+  --input-text: var(--md-sys-color-on-surface, #e9ecef);
+  background-color: var(--input-bg, var(--md-sys-color-surface-container-high, #3a424a));
+  border-color: var(--input-border, var(--md-sys-color-outline, #495057));
+}
+
+/* We've removed the drag handle since it's not functional */
+
+/* Add button at the top level */
+.btn-add-bookmark {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-weight: 500;
+  position: relative;
+  padding-left: 24px;
+}
+
+.btn-add-bookmark::before {
+  content: "";
+  position: absolute;
+  left: 12px;
+  top: 0;
+  width: 2px;
+  height: 50%;
+  background-color: currentColor;
+}
+
+.btn-add-bookmark.top-level::before {
+  display: none;
+}
+
+/* Relationship indicators */
+.bookmark-relationship-indicator {
+  position: absolute;
+  left: -15px;
+  top: 0;
+  height: 100%;
+  width: 14px;
+  pointer-events: none;
+}
+
+.relationship-line {
+  position: absolute;
+  left: 7px;
+  top: 0;
+  height: 100%;
+  width: 2px;
+  background-color: var(--relationship-color, var(--md-nav-section-color-other, #72bd54));
+}
+
+.relationship-arrow {
+  position: absolute;
+  left: 5px;
+  top: 50%;
+  width: 8px;
+  height: 2px;
+  background-color: var(--relationship-color, var(--md-nav-section-color-other, #72bd54));
+}
+
+[data-bs-theme="dark"] .bookmark-relationship-indicator {
+  --relationship-color: var(--favourite-add, #9ed18c);
+}
+
+/* Empty state */
+.empty-bookmarks {
+  padding: 30px;
+  text-align: center;
+  color: var(--text-muted, var(--md-sys-color-on-surface-variant, #6c757d));
+  background-color: var(--bg-empty, var(--md-sys-color-surface-container-lowest, #ffffff));
+  border-radius: 0.375rem;
+  border: 1px dashed var(--border-empty, var(--md-sys-color-outline, #ced4da));
+}
+
+[data-bs-theme="dark"] .empty-bookmarks {
+  --text-muted: var(--md-sys-color-on-surface-variant, #adb5bd);
+  --bg-empty: var(--md-sys-color-surface-container-low, #24282e);
+  --border-empty: var(--md-sys-color-outline, #495057);
+}

stirling-pdf/src/main/resources/static/js/pages/edit-table-of-contents.js

@@ -0,0 +1,653 @@
+document.addEventListener('DOMContentLoaded', function() {
+  const bookmarksContainer = document.getElementById('bookmarks-container');
+  const addBookmarkBtn = document.getElementById('addBookmarkBtn');
+  const bookmarkDataInput = document.getElementById('bookmarkData');
+  let bookmarks = [];
+  let counter = 0; // Used for generating unique IDs
+
+  // Add event listener to the file input to extract existing bookmarks
+  document.getElementById('fileInput-input').addEventListener('change', async function(e) {
+    if (!e.target.files || e.target.files.length === 0) {
+      return;
+    }
+
+    // Reset bookmarks initially
+    bookmarks = [];
+    updateBookmarksUI();
+
+    const formData = new FormData();
+    formData.append('file', e.target.files[0]);
+
+    // Show loading indicator
+    showLoadingIndicator();
+
+    try {
+      // Call the API to extract bookmarks using fetchWithCsrf for CSRF protection
+      const response = await fetchWithCsrf('/api/v1/general/extract-bookmarks', {
+        method: 'POST',
+        body: formData
+      });
+
+      if (!response.ok) {
+        throw new Error(`Failed to extract bookmarks: ${response.status} ${response.statusText}`);
+      }
+
+      const extractedBookmarks = await response.json();
+
+      // Convert extracted bookmarks to our format with IDs
+      if (extractedBookmarks && extractedBookmarks.length > 0) {
+        bookmarks = extractedBookmarks.map(convertExtractedBookmark);
+      } else {
+        showEmptyState();
+      }
+    } catch (error) {
+      // Show error message
+      showErrorMessage('Failed to extract bookmarks. You can still create new ones.');
+
+      // Add a default bookmark if no bookmarks and error
+      if (bookmarks.length === 0) {
+        showEmptyState();
+      }
+    } finally {
+      // Remove loading indicator
+      removeLoadingIndicator();
+
+      // Update the UI
+      updateBookmarksUI();
+    }
+  });
+
+  function showLoadingIndicator() {
+    const loadingEl = document.createElement('div');
+    loadingEl.className = 'alert alert-info';
+    loadingEl.textContent = 'Loading bookmarks from PDF...';
+    loadingEl.id = 'loading-bookmarks';
+    bookmarksContainer.innerHTML = '';
+    bookmarksContainer.appendChild(loadingEl);
+  }
+
+  function removeLoadingIndicator() {
+    const loadingEl = document.getElementById('loading-bookmarks');
+    if (loadingEl) {
+      loadingEl.remove();
+    }
+  }
+
+  function showErrorMessage(message) {
+    const errorEl = document.createElement('div');
+    errorEl.className = 'alert alert-danger';
+    errorEl.textContent = message;
+    bookmarksContainer.appendChild(errorEl);
+  }
+
+  function showEmptyState() {
+    const emptyStateEl = document.createElement('div');
+    emptyStateEl.className = 'empty-bookmarks mb-3';
+    emptyStateEl.innerHTML = `
+      <span class="material-symbols-rounded mb-2" style="font-size: 48px;">bookmark_add</span>
+      <h5>No bookmarks found</h5>
+      <p class="mb-3">This PDF doesn't have any bookmarks yet. Add your first bookmark to get started.</p>
+      <button type="button" class="btn btn-primary btn-add-first-bookmark">
+        <span class="material-symbols-rounded">add</span> Add First Bookmark
+      </button>
+    `;
+
+    // Add event listener to the "Add First Bookmark" button
+    emptyStateEl.querySelector('.btn-add-first-bookmark').addEventListener('click', function() {
+      addBookmark(null, 'New Bookmark', 1);
+      emptyStateEl.remove();
+    });
+
+    bookmarksContainer.appendChild(emptyStateEl);
+  }
+
+  // Function to convert extracted bookmarks to our format with IDs
+  function convertExtractedBookmark(bookmark) {
+    counter++;
+    const result = {
+      id: Date.now() + counter, // Generate a unique ID
+      title: bookmark.title || 'Untitled Bookmark',
+      pageNumber: bookmark.pageNumber || 1,
+      children: [],
+      expanded: false // All bookmarks start collapsed for better visibility
+    };
+
+    // Convert children recursively
+    if (bookmark.children && bookmark.children.length > 0) {
+      result.children = bookmark.children.map(child => {
+        return convertExtractedBookmark(child);
+      });
+    }
+
+    return result;
+  }
+
+  // Add bookmark button click handler
+  addBookmarkBtn.addEventListener('click', function(e) {
+    e.preventDefault();
+    addBookmark();
+  });
+
+  // Add form submit handler to update JSON data
+  document.getElementById('editTocForm').addEventListener('submit', function() {
+    updateBookmarkData();
+  });
+
+  function addBookmark(parent = null, title = '', pageNumber = 1) {
+    counter++;
+    const newBookmark = {
+      id: Date.now() + counter,
+      title: title || 'New Bookmark',
+      pageNumber: pageNumber || 1,
+      children: [],
+      expanded: false // New bookmarks start collapsed
+    };
+
+    if (parent === null) {
+      bookmarks.push(newBookmark);
+    } else {
+      const parentBookmark = findBookmark(bookmarks, parent);
+      if (parentBookmark) {
+        parentBookmark.children.push(newBookmark);
+        parentBookmark.expanded = true; // Auto-expand the parent when adding a child
+      } else {
+        // Add to root level if parent not found
+        bookmarks.push(newBookmark);
+      }
+    }
+
+    updateBookmarksUI();
+
+    // After updating UI, find and focus the new bookmark's title field
+    setTimeout(() => {
+      const newElement = document.querySelector(`[data-id="${newBookmark.id}"]`);
+      if (newElement) {
+        const titleInput = newElement.querySelector('.bookmark-title');
+        if (titleInput) {
+          titleInput.focus();
+          titleInput.select();
+        }
+        // Scroll to the new element
+        newElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
+      }
+    }, 50);
+  }
+
+  function findBookmark(bookmarkArray, id) {
+    for (const bookmark of bookmarkArray) {
+      if (bookmark.id === id) {
+        return bookmark;
+      }
+      if (bookmark.children.length > 0) {
+        const found = findBookmark(bookmark.children, id);
+        if (found) return found;
+      }
+    }
+    return null;
+  }
+
+  // Find the parent bookmark of a given bookmark by ID
+  function findParentBookmark(bookmarkArray, id, parent = null) {
+    for (const bookmark of bookmarkArray) {
+      if (bookmark.id === id) {
+        return parent; // Return the parent ID (or null if top-level)
+      }
+
+      if (bookmark.children.length > 0) {
+        const found = findParentBookmark(bookmark.children, id, bookmark.id);
+        if (found !== undefined) return found;
+      }
+    }
+    return undefined; // Not found at this level
+  }
+
+  function removeBookmark(id) {
+    // Remove from top level
+    const index = bookmarks.findIndex(b => b.id === id);
+    if (index !== -1) {
+      bookmarks.splice(index, 1);
+      updateBookmarksUI();
+      return;
+    }
+
+    // Remove from children
+    function removeFromChildren(bookmarkArray, id) {
+      for (const bookmark of bookmarkArray) {
+        const childIndex = bookmark.children.findIndex(b => b.id === id);
+        if (childIndex !== -1) {
+          bookmark.children.splice(childIndex, 1);
+          return true;
+        }
+        if (removeFromChildren(bookmark.children, id)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    if (removeFromChildren(bookmarks, id)) {
+      updateBookmarksUI();
+    }
+
+    // If no bookmarks left, show empty state
+    if (bookmarks.length === 0) {
+      showEmptyState();
+    }
+  }
+
+  function toggleBookmarkExpanded(id) {
+    const bookmark = findBookmark(bookmarks, id);
+    if (bookmark) {
+      bookmark.expanded = !bookmark.expanded;
+      updateBookmarksUI();
+    }
+  }
+
+  function updateBookmarkData() {
+    // Create a clean version without the IDs for submission
+    const cleanBookmarks = bookmarks.map(cleanBookmark);
+    bookmarkDataInput.value = JSON.stringify(cleanBookmarks);
+  }
+
+  function cleanBookmark(bookmark) {
+    return {
+      title: bookmark.title,
+      pageNumber: bookmark.pageNumber,
+      children: bookmark.children.map(cleanBookmark)
+    };
+  }
+
+  function updateBookmarksUI() {
+    if (!bookmarksContainer) {
+      return;
+    }
+
+    // Only clear the container if there are no error messages or loading indicators
+    if (!document.querySelector('#bookmarks-container .alert')) {
+      bookmarksContainer.innerHTML = '';
+    }
+
+    // Check if there are bookmarks to display
+    if (bookmarks.length === 0 && !document.querySelector('.empty-bookmarks')) {
+      showEmptyState();
+    } else {
+      // Remove empty state if it exists and there are bookmarks
+      const emptyState = document.querySelector('.empty-bookmarks');
+      if (emptyState && bookmarks.length > 0) {
+        emptyState.remove();
+      }
+
+      // Create bookmark elements
+      bookmarks.forEach(bookmark => {
+        const bookmarkElement = createBookmarkElement(bookmark);
+        bookmarksContainer.appendChild(bookmarkElement);
+      });
+    }
+
+    updateBookmarkData();
+
+    // Initialize tooltips for dynamically added elements
+    if (typeof $ !== 'undefined') {
+      $('[data-bs-toggle="tooltip"]').tooltip();
+    }
+  }
+
+  // Create the main bookmark element with collapsible interface
+  function createBookmarkElement(bookmark, level = 0) {
+    const bookmarkEl = document.createElement('div');
+    bookmarkEl.className = 'bookmark-item';
+    bookmarkEl.dataset.id = bookmark.id;
+    bookmarkEl.dataset.level = level;
+
+    // Create the header (always visible part)
+    const header = createBookmarkHeader(bookmark, level);
+    bookmarkEl.appendChild(header);
+
+    // Create the content (collapsible part)
+    const content = document.createElement('div');
+    content.className = 'bookmark-content';
+    if (!bookmark.expanded) {
+      content.style.display = 'none';
+    }
+
+    // Main input row
+    const inputRow = createInputRow(bookmark);
+    content.appendChild(inputRow);
+    bookmarkEl.appendChild(content);
+
+    // Add children container if has children and expanded
+    if (bookmark.children && bookmark.children.length > 0) {
+      const childrenContainer = createChildrenContainer(bookmark, level);
+      if (bookmark.expanded) {
+        bookmarkEl.appendChild(childrenContainer);
+      }
+    }
+
+    return bookmarkEl;
+  }
+
+  // Create the header that's always visible
+  function createBookmarkHeader(bookmark, level) {
+    const header = document.createElement('div');
+    header.className = 'bookmark-header';
+    if (!bookmark.expanded) {
+      header.classList.add('collapsed');
+    }
+
+    // Left side of header with expand/collapse and info
+    const headerLeft = document.createElement('div');
+    headerLeft.className = 'd-flex align-items-center';
+
+    // Toggle expand/collapse icon with child count
+    const toggleContainer = document.createElement('div');
+    toggleContainer.className = 'd-flex align-items-center';
+    toggleContainer.style.marginRight = '8px';
+
+    // Only show toggle if has children
+    if (bookmark.children && bookmark.children.length > 0) {
+      // Create toggle icon
+      const toggleIcon = document.createElement('span');
+      toggleIcon.className = 'material-symbols-rounded toggle-icon me-1';
+      toggleIcon.textContent = 'expand_more';
+      toggleIcon.style.cursor = 'pointer';
+      toggleContainer.appendChild(toggleIcon);
+
+      // Add child count indicator
+      const childCount = document.createElement('span');
+      childCount.className = 'badge rounded-pill';
+      // Use theme-appropriate badge color
+      const isDarkMode = document.documentElement.getAttribute('data-bs-theme') === 'dark';
+      childCount.classList.add(isDarkMode ? 'bg-info' : 'bg-secondary');
+      childCount.style.fontSize = '0.7rem';
+      childCount.style.padding = '0.2em 0.5em';
+      childCount.textContent = bookmark.children.length;
+      childCount.setAttribute('data-bs-toggle', 'tooltip');
+      childCount.setAttribute('data-bs-placement', 'top');
+      childCount.title = `${bookmark.children.length} child bookmark${bookmark.children.length > 1 ? 's' : ''}`;
+      toggleContainer.appendChild(childCount);
+    } else {
+      // Add spacer if no children
+      const spacer = document.createElement('span');
+      spacer.style.width = '24px';
+      spacer.style.display = 'inline-block';
+      toggleContainer.appendChild(spacer);
+    }
+
+    headerLeft.appendChild(toggleContainer);
+
+    // Level indicator for nested items
+    if (level > 0) {
+      // Add relationship indicator visual line
+      const relationshipIndicator = document.createElement('div');
+      relationshipIndicator.className = 'bookmark-relationship-indicator';
+
+      const line = document.createElement('div');
+      line.className = 'relationship-line';
+      relationshipIndicator.appendChild(line);
+
+      const arrow = document.createElement('div');
+      arrow.className = 'relationship-arrow';
+      relationshipIndicator.appendChild(arrow);
+
+      header.appendChild(relationshipIndicator);
+
+      // Text indicator
+      const levelIndicator = document.createElement('span');
+      levelIndicator.className = 'bookmark-level-indicator';
+      levelIndicator.textContent = `Child`;
+      headerLeft.appendChild(levelIndicator);
+    }
+
+    // Title preview
+    const titlePreview = document.createElement('span');
+    titlePreview.className = 'bookmark-title-preview';
+    titlePreview.textContent = bookmark.title;
+    headerLeft.appendChild(titlePreview);
+
+    // Page number preview
+    const pagePreview = document.createElement('span');
+    pagePreview.className = 'bookmark-page-preview';
+    pagePreview.textContent = `Page ${bookmark.pageNumber}`;
+    headerLeft.appendChild(pagePreview);
+
+    // Right side of header with action buttons
+    const headerRight = document.createElement('div');
+    headerRight.className = 'bookmark-actions-header';
+
+    // Quick add buttons with clear visual distinction - using Stirling-PDF's tooltip system
+    const quickAddChildButton = createButton('subdirectory_arrow_right', 'btn-add-child', 'Add child bookmark', function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+      addBookmark(bookmark.id);
+    });
+
+    const quickAddSiblingButton = createButton('add', 'btn-add-sibling', 'Add sibling bookmark', function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+
+      // Find parent of current bookmark
+      const parentId = findParentBookmark(bookmarks, bookmark.id);
+      addBookmark(parentId, '', bookmark.pageNumber); // Same level as current bookmark
+    });
+
+    // Quick remove button
+    const quickRemoveButton = createButton('delete', 'btn-outline-danger', 'Remove bookmark', function(e) {
+      e.preventDefault();
+      e.stopPropagation();
+
+      if (confirm('Are you sure you want to remove this bookmark' + 
+                  (bookmark.children.length > 0 ? ' and all its children?' : '?'))) {
+        removeBookmark(bookmark.id);
+      }
+    });
+
+    headerRight.appendChild(quickAddChildButton);
+    headerRight.appendChild(quickAddSiblingButton); 
+    headerRight.appendChild(quickRemoveButton);
+
+    // Assemble header
+    header.appendChild(headerLeft);
+    header.appendChild(headerRight);
+
+    // Add click handler for expansion toggle
+    header.addEventListener('click', function(e) {
+      // Only toggle if not clicking on buttons
+      if (!e.target.closest('button')) {
+        toggleBookmarkExpanded(bookmark.id);
+      }
+    });
+
+    return header;
+  }
+
+  function createInputRow(bookmark) {
+    const row = document.createElement('div');
+    row.className = 'row';
+
+    // Title input
+    row.appendChild(createTitleInputElement(bookmark));
+
+    // Page input
+    row.appendChild(createPageInputElement(bookmark));
+
+    return row;
+  }
+
+  function createTitleInputElement(bookmark) {
+    const titleCol = document.createElement('div');
+    titleCol.className = 'col-md-8';
+
+    const titleGroup = document.createElement('div');
+    titleGroup.className = 'mb-3';
+
+    const titleLabel = document.createElement('label');
+    titleLabel.textContent = 'Title';
+    titleLabel.className = 'form-label';
+
+    const titleInput = document.createElement('input');
+    titleInput.type = 'text';
+    titleInput.className = 'form-control bookmark-title';
+    titleInput.value = bookmark.title;
+    titleInput.addEventListener('input', function() {
+      bookmark.title = this.value;
+      updateBookmarkData();
+
+      // Also update the preview in the header
+      const header = titleInput.closest('.bookmark-item').querySelector('.bookmark-title-preview');
+      if (header) {
+        header.textContent = this.value;
+      }
+    });
+
+    titleGroup.appendChild(titleLabel);
+    titleGroup.appendChild(titleInput);
+    titleCol.appendChild(titleGroup);
+
+    return titleCol;
+  }
+
+  function createPageInputElement(bookmark) {
+    const pageCol = document.createElement('div');
+    pageCol.className = 'col-md-4';
+
+    const pageGroup = document.createElement('div');
+    pageGroup.className = 'mb-3';
+
+    const pageLabel = document.createElement('label');
+    pageLabel.textContent = 'Page';
+    pageLabel.className = 'form-label';
+
+    const pageInput = document.createElement('input');
+    pageInput.type = 'number';
+    pageInput.className = 'form-control bookmark-page';
+    pageInput.value = bookmark.pageNumber;
+    pageInput.min = 1;
+    pageInput.addEventListener('input', function() {
+      bookmark.pageNumber = parseInt(this.value) || 1;
+      updateBookmarkData();
+
+      // Also update the preview in the header
+      const header = pageInput.closest('.bookmark-item').querySelector('.bookmark-page-preview');
+      if (header) {
+        header.textContent = `Page ${bookmark.pageNumber}`;
+      }
+    });
+
+    pageGroup.appendChild(pageLabel);
+    pageGroup.appendChild(pageInput);
+    pageCol.appendChild(pageGroup);
+
+    return pageCol;
+  }
+
+  function createButton(icon, className, title, clickHandler) {
+    const button = document.createElement('button');
+    button.type = 'button';
+    button.className = `btn ${className} btn-bookmark-action`;
+    button.innerHTML = `<span class="material-symbols-rounded">${icon}</span>`;
+
+    // Use Bootstrap tooltips
+    button.setAttribute('data-bs-toggle', 'tooltip');
+    button.setAttribute('data-bs-placement', 'top');
+    button.title = title;
+
+    button.addEventListener('click', clickHandler);
+    return button;
+  }
+
+  function createChildrenContainer(bookmark, level) {
+    const childrenContainer = document.createElement('div');
+    childrenContainer.className = 'bookmark-children';
+
+    bookmark.children.forEach(child => {
+      childrenContainer.appendChild(createBookmarkElement(child, level + 1));
+    });
+
+    return childrenContainer;
+  }
+
+  // Update the add bookmark button appearance with clear visual cue
+  addBookmarkBtn.innerHTML = '<span class="material-symbols-rounded">add</span> Add Top-level Bookmark';
+  addBookmarkBtn.className = 'btn btn-primary btn-add-bookmark top-level';
+
+  // Use Bootstrap tooltips
+  addBookmarkBtn.setAttribute('data-bs-toggle', 'tooltip');
+  addBookmarkBtn.setAttribute('data-bs-placement', 'top');
+  addBookmarkBtn.title = 'Add a new top-level bookmark';
+
+  // Add icon to empty state button as well
+  const updateEmptyStateButton = function() {
+    const emptyStateBtn = document.querySelector('.btn-add-first-bookmark');
+    if (emptyStateBtn) {
+      emptyStateBtn.innerHTML = '<span class="material-symbols-rounded">add</span> Add First Bookmark';
+      emptyStateBtn.setAttribute('data-bs-toggle', 'tooltip');
+      emptyStateBtn.setAttribute('data-bs-placement', 'top');
+      emptyStateBtn.title = 'Add first bookmark';
+
+      // Initialize tooltips for the empty state button
+      if (typeof $ !== 'undefined') {
+        $('[data-bs-toggle="tooltip"]').tooltip();
+      }
+    }
+  };
+
+  // Initialize with an empty state if no bookmarks
+  if (bookmarks.length === 0) {
+    showEmptyState();
+    updateEmptyStateButton();
+  }
+
+  // Listen for theme changes to update badge colors
+  const observer = new MutationObserver(function(mutations) {
+    mutations.forEach(function(mutation) {
+      if (mutation.attributeName === 'data-bs-theme') {
+        const isDarkMode = document.documentElement.getAttribute('data-bs-theme') === 'dark';
+        document.querySelectorAll('.badge').forEach(badge => {
+          badge.classList.remove('bg-secondary', 'bg-info');
+          badge.classList.add(isDarkMode ? 'bg-info' : 'bg-secondary');
+        });
+      }
+    });
+  });
+
+  observer.observe(document.documentElement, { attributes: true });
+
+  // Add visual enhancement to clearly show the top-level/child relationship
+  document.addEventListener('mouseover', function(e) {
+    // When hovering over add buttons, highlight their relationship targets
+    const button = e.target.closest('.btn-add-child, .btn-add-sibling');
+    if (button) {
+      if (button.classList.contains('btn-add-child')) {
+        // Highlight parent-child relationship
+        const bookmarkItem = button.closest('.bookmark-item');
+        if (bookmarkItem) {
+          bookmarkItem.style.boxShadow = '0 0 0 2px var(--btn-add-child-border, #198754)';
+        }
+      } else if (button.classList.contains('btn-add-sibling')) {
+        // Highlight sibling relationship
+        const bookmarkItem = button.closest('.bookmark-item');
+        if (bookmarkItem) {
+          // Find siblings
+          const parent = bookmarkItem.parentElement;
+          const siblings = parent.querySelectorAll(':scope > .bookmark-item');
+          siblings.forEach(sibling => {
+            if (sibling !== bookmarkItem) {
+              sibling.style.boxShadow = '0 0 0 2px var(--btn-add-sibling-border, #0d6efd)';
+            }
+          });
+        }
+      }
+    }
+  });
+
+  document.addEventListener('mouseout', function(e) {
+    // Remove highlights when not hovering
+    const button = e.target.closest('.btn-add-child, .btn-add-sibling');
+    if (button) {
+      // Remove all highlights
+      document.querySelectorAll('.bookmark-item').forEach(item => {
+        item.style.boxShadow = '';
+      });
+    }
+  });
+});

stirling-pdf/src/main/resources/templates/account.html

@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
   <head>
-  <th:block th:insert="~{fragments/common :: head(title=#{account.title})}"></th:block>
+    <th:block th:insert="~{fragments/common :: head(title=#{account.title})}"></th:block>
+    <link rel="stylesheet" th:href="@{/css/modern-tables.css}">
   </head>
 
   <body>
@@ -9,352 +10,464 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-9 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon organize">settings_account_box</span>
-                <span class="tool-header-text" th:text="#{account.accountSettings}">User Settings</span>
-              </div>
-
-              <!-- User Settings Title -->
-              <th:block th:if="${messageType}">
-              <div class="alert alert-danger">
+        
+        <div class="data-container">
+          <div class="data-panel">
+            <div class="data-header">
+              <h1 class="data-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">settings_account_box</span>
+                </span>
+                <span th:text="#{account.accountSettings}">User Settings</span>
+              </h1>
+            </div>
+            
+            <div class="data-body">
+              <div th:if="${messageType}" class="alert alert-danger data-mb-3">
                 <span th:text="#{${messageType}}">Default message if not found</span>
               </div>
-              </th:block>
-
-              <!-- At the top of the user settings -->
-              <h3 class="text-center"><span th:text="#{welcome} + ' ' + ${username}">User</span>!</h3>
-              <th:block th:if="${error}">
-              <div class="alert alert-danger" role="alert">
+              
+              <div th:if="${error}" class="alert alert-danger data-mb-3" role="alert">
                 <span th:text="${error}">Error Message</span>
               </div>
-              </th:block>
-
-              <!-- Change Username Form -->
+              
+              <!-- Admin Settings Banner (for admins only) -->
+              <div th:if="${role == 'ROLE_ADMIN'}" class="data-panel data-mb-3" style="background-color: var(--md-sys-color-secondary-container);">
+				  <div class="data-body" style="display: flex; align-items: center; justify-content: space-between; padding: 1rem 1.5rem; background-color: var(--md-sys-color-secondary-container);">
+				    <div style="display: flex; align-items: center; gap: 1rem;">
+				      <span class="material-symbols-rounded" style="font-size: 2rem; color: var(--md-sys-color-secondary);">
+				        admin_panel_settings
+				      </span>
+				      <div>
+				        <h4 style="margin: 0; color: var(--md-sys-color-secondary);" th:text="#{account.adminTitle}">Administrator Tools</h4>
+				        <p style="margin: 0.25rem 0 0 0; color: var(--md-sys-color-secondary);" th:text="#{account.adminNotif}">You have admin privileges. Access system settings and user management.</p>
+				      </div>
+				    </div>
+				    <a class="data-btn" th:href="@{'/adminSettings'}" role="button" target="_blank"
+				       style="background-color: var(--md-sys-color-secondary); color: var(--md-sys-color-on-secondary); display: inline-flex; align-items: center; gap: 0.5rem; padding: 0.625rem 1.25rem; border-radius: 0.5rem; font-weight: 500; border: none; cursor: pointer; text-decoration: none;">
+				      <span class="material-symbols-rounded">admin_panel_settings</span>
+				      <span th:text="#{account.adminSettings}">Admin Settings</span>
+				    </a>
+				  </div>
+				</div>
+				
+              <!-- Account Management Buttons -->
               <th:block th:if="not ${oAuth2Login} or not ${saml2Login}">
-              <h4 th:text="#{account.changeUsername}">Change Username?</h4>
-              <form id="formsavechangeusername" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-username'}" method="post">
-                <div class="mb-3">
-                  <label for="newUsername" th:text="#{account.newUsername}">Change Username</label>
-                  <input type="text" class="form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
-                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+                <div class="data-section-title">Account Management</div>
+                <div class="data-actions data-actions-start data-mb-3">
+                  <button class="data-btn data-btn-primary" data-bs-toggle="modal" data-bs-target="#changeUsernameModal">
+                    <span class="material-symbols-rounded">edit</span>
+                    <span th:text="#{account.changeUsername}">Change Username</span>
+                  </button>
+                  <button class="data-btn data-btn-primary" data-bs-toggle="modal" data-bs-target="#changePasswordModal">
+                    <span class="material-symbols-rounded">key</span>
+                    <span th:text="#{account.changePassword}">Change Password</span>
+                  </button>
                 </div>
-                <div class="mb-3">
-                  <label for="currentPasswordChangeUsername" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
-                </div>
-                <div class="mb-3">
-                  <button type="submit" class="btn btn-primary" th:text="#{account.changeUsername}">Change Username</button>
-                </div>
-              </form>
               </th:block>
 
-              <!-- Change Password Form -->
-              <th:block th:if="not ${oAuth2Login} or not ${saml2Login}">
-              <h4 th:text="#{account.changePassword}">Change Password?</h4>
-              <form id="formsavechangepassword" class="bg-card mt-4 mb-4" th:action="@{'/api/v1/user/change-password'}" method="post">
-                <div class="mb-3">
-                  <label for="currentPassword" th:text="#{account.oldPassword}">Old Password</label>
-                  <input type="password" class="form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
+              <!-- API Key Section -->
+              <div class="data-section-title" th:text="#{account.yourApiKey}">API Key</div>
+              <div class="data-panel data-mb-3">
+                <div class="data-header">
+                  <h5 class="data-title">
+                    <span class="data-icon">
+                      <span class="material-symbols-rounded">key</span>
+                    </span>
+                    <span th:text="#{account.yourApiKey}">API Key</span>
+                  </h5>
                 </div>
-                <div class="mb-3">
-                  <label for="newPassword" th:text="#{account.newPassword}">New Password</label>
-                  <input type="password" class="form-control" name="newPassword" id="newPassword" th:placeholder="#{account.newPassword}">
-                </div>
-                <div class="mb-3">
-                  <label for="confirmNewPassword" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
-                  <input type="password" class="form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
-                </div>
-                <div class="mb-3">
-                  <span id="confirmPasswordError" style="display: none;" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
-                  <button type="submit" class="btn btn-primary" th:text="#{account.changePassword}">Change Password</button>
-                </div>
-              </form>
-              </th:block>
-
-            <!-- API Key Form -->
-            <h4 th:text="#{account.yourApiKey}">API Key</h4>
-              <div class="card mt-4 mb-4">
-                <div class="card-header" th:text="#{account.yourApiKey}"></div>
-                <div class="card-body">
-                  <div class="input-group mb-3">
-                    <input type="password" class="form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly>
-                    <div class="input-group-append">
-                      <button class="btn btn-secondary" id="copyBtn" type="button" onclick="copyToClipboard()">
-                        <span class="material-symbols-rounded">
-                        content_copy
-                      </span>
-                      </button>
-                      <button class="btn btn-secondary" id="showBtn" type="button" onclick="showApiKey()">
-                        <span class="material-symbols-rounded" id="eyeIcon">
-                          visibility
-                        </span>
-                      </button>
-                      <button class="btn btn-secondary" id="refreshBtn" type="button" onclick="refreshApiKey()">
-                        <span class="material-symbols-rounded">
-                          refresh
-                        </span>
-                      </button>
-                    </div>
+                <div class="data-body">
+                  <div style="display: flex; gap: 0.5rem;">
+                    <input class="data-form-control" id="apiKey" th:placeholder="#{account.yourApiKey}" readonly style="flex: 1;">
+                    <button class="data-btn data-btn-secondary" id="copyBtn" type="button" onclick="copyToClipboard()" title="Copy to clipboard">
+                      <span class="material-symbols-rounded">content_copy</span>
+                    </button>
+                    <button class="data-btn data-btn-secondary" id="showBtn" type="button" onclick="showApiKey()" title="Show/hide API key">
+                      <span class="material-symbols-rounded" id="eyeIcon">visibility</span>
+                    </button>
+                    <button class="data-btn data-btn-secondary" id="refreshBtn" type="button" onclick="refreshApiKey()" title="Refresh API key">
+                      <span class="material-symbols-rounded">refresh</span>
+                    </button>
                   </div>
                 </div>
               </div>
-              <script th:inline="javascript">
-                jQuery.validator.addMethod("usernamePattern", function(value, element) {
-                  // Regular expression for user name: Min. 3 characters, max. 50 characters
-                  const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
 
-                  // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
-                  const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
-
-                  // Check if the field is optional or meets the requirements
-                  return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
-                }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
-                $(document).ready(function() {
-                  $.validator.addMethod("passwordMatch", function(value, element) {
-                    return $('#newPassword').val() === $('#confirmNewPassword').val();
-                  }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
-                  $('#formsavechangepassword').validate({
-                    rules: {
-                      currentPassword: {
-                        required: true
-                      },
-                      newPassword: {
-                        required: true
-                      },
-                      confirmNewPassword: {
-                        required: true,
-                        passwordMatch: true
-                      },
-                      errorPlacement: function(error, element) {
-                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
-                            $("#confirmPasswordError").text(error.text()).show();
-                          } else {
-                              error.insertAfter(element);
-                          }
-                      },
-                      success: function(label, element) {
-                          if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
-                            $("#confirmPasswordError").hide();
-                          }
-                      }
-                    }
-                  });
-
-                  $('#formsavechangeusername').validate({
-                    rules: {
-                      newUsername: {
-                        required: true,
-                        usernamePattern: true
-                      },
-                      currentPasswordChangeUsername: {
-                        required: true
-                      }
-                      },
-                      messages: {
-                        newUsername: {
-                              usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
-                          },
-                      },
-                      errorPlacement: function(error, element) {
-                          if (element.attr("name") === "newUsername") {
-                              $("#usernameError").text(error.text()).show();
-                          } else {
-                              error.insertAfter(element);
-                          }
-                      },
-                      success: function(label, element) {
-                          if ($(element).attr("name") === "newUsername") {
-                              $("#usernameError").hide();
-                          }
-                      }
-                  });
-                });
-              </script>
-
-              <script th:inline="javascript">
-                function copyToClipboard() {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  apiKeyElement.select();
-                  document.execCommand("copy");
-                }
-
-                function showApiKey() {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  const copyBtn = document.getElementById("copyBtn");
-                  const eyeIcon = document.getElementById("eyeIcon");
-                  if (apiKeyElement.type === "password") {
-                    apiKeyElement.type = "text";
-                    eyeIcon.textContent = "visibility_off";
-                    copyBtn.disabled = false;  // Enable copy button when API key is visible
-                  } else {
-                    apiKeyElement.type = "password";
-                    eyeIcon.textContent = "visibility";
-                    copyBtn.disabled = true;  // Disable copy button when API key is hidden
-                  }
-                }
-
-                document.addEventListener("DOMContentLoaded", async function() {
-                  showApiKey();
-                  try {
-                    /*<![CDATA[*/
-                    const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
-                    /*]]>*/
-                    let response = await window.fetchWithCsrf(urlGetApiKey, { method: 'POST' });
-                    if (response.status === 200) {
-                      let apiKey = await response.text();
-                      manageUIState(apiKey);
-                    } else {
-                      manageUIState(null);
-                    }
-                  } catch (error) {
-                    console.error('There was an error:', error);
-                  }
-                });
-
-                async function refreshApiKey() {
-                  try {
-                    /*<![CDATA[*/
-                    const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
-                    /*]]>*/
-                    let response = await window.fetchWithCsrf(urlUpdateApiKey, { method: 'POST' });
-                    if (response.status === 200) {
-                      let apiKey = await response.text();
-                      manageUIState(apiKey);
-                      document.getElementById("apiKey").type = 'text';
-                      document.getElementById("copyBtn").disabled = false;
-                    } else {
-                      alert('Error refreshing API key.');
-                    }
-                  } catch (error) {
-                    console.error('There was an error:', error);
-                  }
-                }
-
-                function manageUIState(apiKey) {
-                  const apiKeyElement = document.getElementById("apiKey");
-                  const showBtn = document.getElementById("showBtn");
-                  const copyBtn = document.getElementById("copyBtn");
-
-                  if (apiKey && apiKey.trim().length > 0) {
-                    apiKeyElement.value = apiKey;
-                    showBtn.disabled = false;
-                    copyBtn.disabled = false;
-                  } else {
-                    apiKeyElement.value = "";
-                    showBtn.disabled = true;
-                    copyBtn.disabled = true;
-                  }
-                }
-              </script>
-
-              <h4 th:text="#{account.syncTitle}">Sync browser settings with Account</h4>
-              <div class="bg-card container mt-4">
-                <h3 th:text="#{account.settingsCompare}">Settings Comparison:</h3>
-                <table id="settingsTable" class="table table-bordered table-sm table-striped">
-                  <thead>
-                    <tr>
-                      <th scope="col" th:text="#{account.property}">Property</th>
-                      <th scope="col" th:text="#{account.accountSettings}">Account Setting</th>
-                      <th scope="col" th:text="#{account.webBrowserSettings}">Web Browser Setting</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <!-- This will be dynamically populated by JavaScript -->
-                  </tbody>
-                </table>
-
-                <div class="buttons-container mt-3 text-center">
-                  <button id="syncToBrowser" class="btn btn-primary btn-sm" th:text="#{account.syncToBrowser}">Sync Account -> Browser</button>
-                  <button id="syncToAccount" class="btn btn-secondary btn-sm" th:text="#{account.syncToAccount}">Sync Account <- Browser</button>
+              <!-- Settings Sync Section -->
+              <div class="data-section-title" th:text="#{account.syncTitle}">Sync browser settings with Account</div>
+              <div class="data-panel data-mb-3">
+                <div class="data-header">
+                  <h5 class="data-title">
+                    <span class="data-icon">
+                      <span class="material-symbols-rounded">sync</span>
+                    </span>
+                    <span th:text="#{account.settingsCompare}">Settings Comparison</span>
+                  </h5>
+                </div>
+                <div class="data-body">
+                  <div class="table-responsive">
+                    <table id="settingsTable" class="data-table">
+                      <thead>
+                        <tr>
+                          <th scope="col" th:text="#{account.property}">Property</th>
+                          <th scope="col" th:text="#{account.accountSettings}">Account Setting</th>
+                          <th scope="col" th:text="#{account.webBrowserSettings}">Web Browser Setting</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <!-- This will be dynamically populated by JavaScript -->
+                      </tbody>
+                    </table>
+                  </div>
+                  
+                  <div class="data-actions data-mt-3">
+                    <button id="syncToBrowser" class="data-btn data-btn-primary">
+                      <span class="material-symbols-rounded">cloud_download</span>
+                      <span th:text="#{account.syncToBrowser}">Sync Account -> Browser</span>
+                    </button>
+                    <button id="syncToAccount" class="data-btn data-btn-secondary">
+                      <span class="material-symbols-rounded">cloud_upload</span>
+                      <span th:text="#{account.syncToAccount}">Sync Account <- Browser</span>
+                    </button>
+                  </div>
                 </div>
-              </div>
-
-              <script th:inline="javascript">
-                document.addEventListener("DOMContentLoaded", async function() {
-                  const settingsTableBody = document.querySelector("#settingsTable tbody");
-
-                  /*<![CDATA[*/
-                  var accountSettingsString = /*[[${settings}]]*/ {};
-                  /*]]>*/
-                  var accountSettings = JSON.parse(accountSettingsString);
-
-                  let allKeys = new Set([...Object.keys(accountSettings), ...Object.keys(localStorage)]);
-
-                  allKeys.forEach(key => {
-                    if(key === 'debug' || key === '0' || key === '1' || key.includes('pdfjs') || key.includes('posthog') || key.includes('pageViews')) return;  // Ignoring specific keys
-
-                    const accountValue = accountSettings[key] || '-';
-                    const browserValue = localStorage.getItem(key) || '-';
-
-                    const row = settingsTableBody.insertRow();
-                    const propertyCell = row.insertCell(0);
-                    const accountCell = row.insertCell(1);
-                    const browserCell = row.insertCell(2);
-
-                    propertyCell.textContent = key;
-                    accountCell.textContent = accountValue;
-                    browserCell.textContent = browserValue;
-                  });
-
-                  document.getElementById('syncToBrowser').addEventListener('click', function() {
-                    // First, clear the local storage
-                    localStorage.clear();
-
-                    // Then, set the account settings to local storage
-                    for (let key in accountSettings) {
-                      if(key !== 'debug' && key !== '0' && key !== '1' && !key.includes('pdfjs') && !key.includes('posthog') && !key.includes('pageViews')) { // Only sync non-ignored keys
-                        localStorage.setItem(key, accountSettings[key]);
-                      }
-                    }
-                    location.reload();  // Refresh the page after sync
-                  });
-
-                  document.getElementById('syncToAccount').addEventListener('click', async  function() {
-                    /*<![CDATA[*/
-                    const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
-                    /*]]>*/
-
-                    let settings = {};
-                    for (let i = 0; i < localStorage.length; i++) {
-                      const key = localStorage.key(i);
-                      if(key !== 'debug' && key !== '0' && key !== '1' && !key.includes('pdfjs') && !key.includes('posthog') && !key.includes('pageViews')) {
-                        settings[key] = localStorage.getItem(key);
-                      }
-                    }
-
-                    try {
-                      const response = await window.fetchWithCsrf(urlUpdateUserSettings, {
-                        method: 'POST',
-                        headers: {
-                          'Content-Type': 'application/json',
-                        },
-                        body: JSON.stringify(settings)
-                      });
-
-                      if (response.ok) {
-                        location.reload();
-                      } else {
-                        alert('Error syncing settings to account');
-                      }
-                    } catch (error) {
-                      console.error('Error:', error);
-                      alert('Error syncing settings to account');
-                    }
-                  });
-                });
-              </script>
-              <div class="mb-3 mt-4 text-center">
-                <a th:href="@{'/logout'}" role="button" class="btn btn-danger" th:text="#{account.signOut}">Sign Out</a>
-                <a th:if="${role == 'ROLE_ADMIN'}" class="btn btn-info" th:href="@{'/adminSettings'}" role="button" th:text="#{account.adminSettings}" target="_blank">Admin Settings</a>
               </div>
             </div>
           </div>
         </div>
       </div>
+      
+      <!-- Change Username Modal -->
+      <div class="modal fade" id="changeUsernameModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsavechangeusername" th:action="@{'/api/v1/user/change-username'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">edit</span>
+                </span>
+                <span th:text="#{account.changeUsername}">Change Username</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="newUsername" class="data-form-label" th:text="#{account.newUsername}">New Username</label>
+                <input type="text" class="data-form-control" name="newUsername" id="newUsername" th:placeholder="#{account.newUsername}">
+                <span id="usernameError" style="display: none; color: var(--md-sys-color-error);" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+              </div>
+              <div class="data-form-group">
+                <label for="currentPasswordChangeUsername" class="data-form-label" th:text="#{password}">Password</label>
+                <input type="password" class="data-form-control" name="currentPasswordChangeUsername" id="currentPasswordChangeUsername" th:placeholder="#{password}">
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{account.changeUsername}">Change Username</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+      
+      <!-- Change Password Modal -->
+      <div class="modal fade" id="changePasswordModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsavechangepassword" th:action="@{'/api/v1/user/change-password'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">key</span>
+                </span>
+                <span th:text="#{account.changePassword}">Change Password</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="currentPassword" class="data-form-label" th:text="#{account.oldPassword}">Old Password</label>
+                <input type="password" class="data-form-control" name="currentPassword" id="currentPassword" th:placeholder="#{account.oldPassword}">
+              </div>
+              <div class="data-form-group">
+                <label for="newPassword" class="data-form-label" th:text="#{account.newPassword}">New Password</label>
+                <input type="password" class="data-form-control" name="newPassword" id="newPassword" th:placeholder="#{account.newPassword}">
+              </div>
+              <div class="data-form-group">
+                <label for="confirmNewPassword" class="data-form-label" th:text="#{account.confirmNewPassword}">Confirm New Password</label>
+                <input type="password" class="data-form-control" name="confirmNewPassword" id="confirmNewPassword" th:placeholder="#{account.confirmNewPassword}">
+                <span id="confirmPasswordError" style="display: none; color: var(--md-sys-color-error);" th:text="#{confirmPasswordErrorMessage}">New Password and Confirm New Password must match.</span>
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{account.changePassword}">Change Password</span>
+                </button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </div>
+    
+    <!-- JavaScript for validation -->
+    <script th:inline="javascript">
+      jQuery.validator.addMethod("usernamePattern", function(value, element) {
+        // Regular expression for user name: Min. 3 characters, max. 50 characters
+        const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
+
+        // Regular expression for email addresses: Max. 320 characters, with RFC-like validation
+        const regexEmail = /^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?:\.[A-Za-z]{2,})$/;
+
+        // Check if the field is optional or meets the requirements
+        return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
+      }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
+      
+      $(document).ready(function() {
+        $.validator.addMethod("passwordMatch", function(value, element) {
+          return $('#newPassword').val() === $('#confirmNewPassword').val();
+        }, /*[[#{confirmPasswordErrorMessage}]]*/ "New Password and Confirm New Password must match.");
+        
+        $('#formsavechangepassword').validate({
+          rules: {
+            currentPassword: {
+              required: true
+            },
+            newPassword: {
+              required: true
+            },
+            confirmNewPassword: {
+              required: true,
+              passwordMatch: true
+            }
+          },
+          errorPlacement: function(error, element) {
+            if (element.attr("name") === "newPassword" || element.attr("name") === "confirmNewPassword") {
+              $("#confirmPasswordError").text(error.text()).show();
+            } else {
+              error.insertAfter(element);
+            }
+          },
+          success: function(label, element) {
+            if ($(element).attr("name") === "newPassword" || $(element).attr("name") === "confirmNewPassword") {
+              $("#confirmPasswordError").hide();
+            }
+          }
+        });
+
+        $('#formsavechangeusername').validate({
+          rules: {
+            newUsername: {
+              required: true,
+              usernamePattern: true
+            },
+            currentPasswordChangeUsername: {
+              required: true
+            }
+          },
+          messages: {
+            newUsername: {
+              usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
+            },
+          },
+          errorPlacement: function(error, element) {
+            if (element.attr("name") === "newUsername") {
+              $("#usernameError").text(error.text()).show();
+            } else {
+              error.insertAfter(element);
+            }
+          },
+          success: function(label, element) {
+            if ($(element).attr("name") === "newUsername") {
+              $("#usernameError").hide();
+            }
+          }
+        });
+      });
+    </script>
+
+    <!-- JavaScript for API Key -->
+    <script th:inline="javascript">
+      function copyToClipboard() {
+        const apiKeyElement = document.getElementById("apiKey");
+        apiKeyElement.select();
+        document.execCommand("copy");
+      }
+
+      function showApiKey() {
+        const apiKeyElement = document.getElementById("apiKey");
+        const copyBtn = document.getElementById("copyBtn");
+        const eyeIcon = document.getElementById("eyeIcon");
+        if (apiKeyElement.type === "password") {
+          apiKeyElement.type = "text";
+          eyeIcon.textContent = "visibility_off";
+          copyBtn.disabled = false;  // Enable copy button when API key is visible
+        } else {
+          apiKeyElement.type = "password";
+          eyeIcon.textContent = "visibility";
+          copyBtn.disabled = true;  // Disable copy button when API key is hidden
+        }
+      }
+
+      document.addEventListener("DOMContentLoaded", async function() {
+        try {
+          /*<![CDATA[*/
+          const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
+          /*]]>*/
+          let response = await window.fetchWithCsrf(urlGetApiKey, { method: 'POST' });
+          if (response.status === 200) {
+            let apiKey = await response.text();
+            manageUIState(apiKey);
+          } else {
+            manageUIState(null);
+          }
+        } catch (error) {
+          console.error('There was an error:', error);
+        }
+        finally {
+          showApiKey();
+        }
+      });
+
+      async function refreshApiKey() {
+        try {
+          /*<![CDATA[*/
+          const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
+          /*]]>*/
+          let response = await window.fetchWithCsrf(urlUpdateApiKey, { method: 'POST' });
+          if (response.status === 200) {
+            let apiKey = await response.text();
+            manageUIState(apiKey);
+            document.getElementById("apiKey").type = 'text';
+            document.getElementById("copyBtn").disabled = false;
+          } else {
+            alert('Error refreshing API key.');
+          }
+        } catch (error) {
+          console.error('There was an error:', error);
+        }
+      }
+
+      function manageUIState(apiKey) {
+        const apiKeyElement = document.getElementById("apiKey");
+        const showBtn = document.getElementById("showBtn");
+        const copyBtn = document.getElementById("copyBtn");
+
+        if (apiKey && apiKey.trim().length > 0) {
+          apiKeyElement.value = apiKey;
+          showBtn.disabled = false;
+          copyBtn.disabled = false;
+        } else {
+          apiKeyElement.value = "";
+          showBtn.disabled = true;
+          copyBtn.disabled = true;
+        }
+      }
+    </script>
+
+    <!-- JavaScript for Settings Sync -->
+   <script th:inline="javascript">
+	  document.addEventListener("DOMContentLoaded", async function() {
+	    const settingsTableBody = document.querySelector("#settingsTable tbody");
+	    
+	    // Helper function to check if a key should be ignored
+	    function shouldIgnoreKey(key) {
+	      return key === 'debug' || 
+	             key === '0' || 
+	             key === '1' || 
+	             key.includes('pdfjs') || 
+	             key.includes('clientSubmissionOrder') || 
+	             key.includes('lastSubmitTime') || 
+	             key.includes('lastClientId') || 
+	             
+	             
+	             key.includes('posthog') || key.includes('ssoRedirectAttempts') || key.includes('lastRedirectAttempt') || key.includes('surveyVersion') || 
+	             key.includes('pageViews');
+	    }
+	
+	    /*<![CDATA[*/
+	    var accountSettingsString = /*[[${settings}]]*/ {};
+	    /*]]>*/
+	    var accountSettings = JSON.parse(accountSettingsString);
+	
+	    let allKeys = new Set([...Object.keys(accountSettings), ...Object.keys(localStorage)]);
+	
+	    allKeys.forEach(key => {
+	      if(shouldIgnoreKey(key)) return;  // Using our helper function
+	
+	      const accountValue = accountSettings[key] || '-';
+	      const browserValue = localStorage.getItem(key) || '-';
+	
+	      const row = settingsTableBody.insertRow();
+	      const propertyCell = row.insertCell(0);
+	      const accountCell = row.insertCell(1);
+	      const browserCell = row.insertCell(2);
+	
+	      propertyCell.textContent = key;
+	      accountCell.textContent = accountValue;
+	      browserCell.textContent = browserValue;
+	    });
+	
+	    document.getElementById('syncToBrowser').addEventListener('click', function() {
+	      // First, clear the local storage
+	      localStorage.clear();
+	
+	      // Then, set the account settings to local storage
+	      for (let key in accountSettings) {
+	        if(!shouldIgnoreKey(key)) { // Using our helper function
+	          localStorage.setItem(key, accountSettings[key]);
+	        }
+	      }
+	      location.reload();  // Refresh the page after sync
+	    });
+	
+	    document.getElementById('syncToAccount').addEventListener('click', async function() {
+	      /*<![CDATA[*/
+	      const urlUpdateUserSettings = /*[[@{/api/v1/user/updateUserSettings}]]*/ "/api/v1/user/updateUserSettings";
+	      /*]]>*/
+	
+	      let settings = {};
+	      for (let i = 0; i < localStorage.length; i++) {
+	        const key = localStorage.key(i);
+	        if(!shouldIgnoreKey(key)) { // Using our helper function
+	          settings[key] = localStorage.getItem(key);
+	        }
+	      }
+	
+	      try {
+	        const response = await window.fetchWithCsrf(urlUpdateUserSettings, {
+	          method: 'POST',
+	          headers: {
+	            'Content-Type': 'application/json',
+	          },
+	          body: JSON.stringify(settings)
+	        });
+	
+	        if (response.ok) {
+	          location.reload();
+	        } else {
+	          alert('Error syncing settings to account');
+	        }
+	      } catch (error) {
+	        console.error('Error:', error);
+	        alert('Error syncing settings to account');
+	      }
+	    });
+	  });
+	</script>
+              
+      
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>

stirling-pdf/src/main/resources/templates/adminSettings.html

@@ -1,18 +1,19 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
   <head>
-  <th:block th:insert="~{fragments/common :: head(title=#{adminUserSettings.title}, header=#{adminUserSettings.header})}"></th:block>
+    <th:block th:insert="~{fragments/common :: head(title=#{adminUserSettings.title}, header=#{adminUserSettings.header})}"></th:block>
+    <link rel="stylesheet" th:href="@{/css/modern-tables.css}">
     <style>
       .active-user {
-        color: green;
-        text-shadow: 0 0 5px green;
+        color: var(--md-sys-color-tertiary);
+        font-weight: 600;
       }
-
+      
       .text-overflow {
         max-width: 100px;
         white-space: nowrap;
         overflow: hidden;
-        text-overflow:ellipsis;
+        text-overflow: ellipsis;
       }
     </style>
   </head>
@@ -22,215 +23,354 @@
     <div id="page-container">
       <div id="content-wrap">
         <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-9 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon organize">manage_accounts</span>
-                <span class="tool-header-text" th:text="#{adminUserSettings.header}">Admin User Control Settings</span>
-              </div>
-
-              <!-- User Settings Title -->
-			<div style="background: var(--md-sys-color-outline-variant);padding: .8rem; margin: 10px 0; border-radius: 2rem; text-align: center;">
-			    <a href="#" 
-			       th:data-bs-toggle="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : 'modal'"
-			       th:data-bs-target="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : '#addUserModal'"
-			       th:class="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? 'btn btn-danger' : 'btn btn-outline-success'"
-			       th:title="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? #{adminUserSettings.maxUsersReached} : #{adminUserSettings.addUser}">
-			        <span class="material-symbols-rounded">person_add</span>
-			        <span th:text="#{adminUserSettings.addUser}">Add New User</span>
-			    </a>
-			    
-			    <a href="#" 
-			       data-bs-toggle="modal" 
-			       data-bs-target="#changeUserRoleModal" 
-			       class="btn btn-outline-success" 
-			       th:title="#{adminUserSettings.changeUserRole}">
-			        <span class="material-symbols-rounded">edit</span>
-			        <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
-			    </a>
-			    
-			    <a th:href="@{'/usage'}" th:if="${@runningEE}"
-				   class="btn btn-outline-success" 
-				   th:title="#{adminUserSettings.usage}">
-				    <span class="material-symbols-rounded">analytics</span>
-				    <span th:text="#{adminUserSettings.usage}">Usage Statistics</span>
-				</a>
-
-			    <div class="my-4">
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.totalUsers}">Total Users:</strong> 
-			        <span th:text="${totalUsers}"></span> 
-			        <span th:if="${@runningProOrHigher}" th:text="'/'+${maxPaidUsers}"></span>
-			        
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.activeUsers}">Active Users:</strong> 
-			        <span th:text="${activeUsers}"></span>
-			        
-			        <strong style="margin-left: 20px;" th:text="#{adminUserSettings.disabledUsers}">Disabled Users:</strong> 
-			        <span th:text="${disabledUsers}"></span>
-			    </div>
-			</div>
-
-
-              <div th:if="${addMessage}" class="p-3" style="background: var(--md-sys-color-outline-variant);border-radius: 2rem; text-align: center;">
-                <div class="alert alert-danger mb-auto">
-                  <span th:text="#{${addMessage}}">Default message if not found</span>
+        
+        <div class="data-container">
+          <div class="data-panel">
+            <div class="data-header">
+              <h1 class="data-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">manage_accounts</span>
+                </span>
+                <span th:text="#{adminUserSettings.header}">Admin User Control Settings</span>
+              </h1>
+            </div>
+            
+            <div class="data-body">
+              <!-- User Stats Banner -->
+              <div class="data-panel data-mb-3" style="background-color: var(--md-sys-color-primary-container);">
+                <div class="data-body" style="padding: 1.25rem;">
+                  <div style="display: flex; flex-wrap: wrap; justify-content: space-around; align-items: center; gap: 1.5rem;">
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        group
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.totalUsers}">Total Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;">
+                          <span th:text="${totalUsers}"></span>
+                          <span th:if="${@runningProOrHigher}" th:text="'/' + ${maxPaidUsers}" style="font-size: 1rem;"></span>
+                        </div>
+                      </div>
+                    </div>
+                    
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        check_circle
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.activeUsers}">Active Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;" th:text="${activeUsers}"></div>
+                      </div>
+                    </div>
+                    
+                    <div style="display: flex; align-items: center; gap: 0.75rem;">
+                      <span class="material-symbols-rounded" style="font-size: 2.25rem; color: var(--md-sys-color-primary);">
+                        person_off
+                      </span>
+                      <div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 0.875rem; font-weight: 500;" th:text="#{adminUserSettings.disabledUsers}">Disabled Users</div>
+                        <div style="color: var(--md-sys-color-primary); font-size: 1.5rem; font-weight: 700;" th:text="${disabledUsers}"></div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
-              <div th:if="${changeMessage}" class="p-3" style="background: var(--md-sys-color-outline-variant);border-radius: 2rem; text-align: center;">
-                <div class="alert alert-danger mb-auto">
-                  <span th:text="#{${changeMessage}}">Default message if not found</span>
-                </div>
+              
+              <!-- Alert Messages -->
+              <div th:if="${addMessage}" th:class="${#strings.contains(addMessage, 'Successfully') or #strings.contains(addMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
+                <span th:text="#{${addMessage}}">Default message if not found</span>
               </div>
-              <div th:if="${deleteMessage}" class="alert alert-danger">
+              
+              <div th:if="${changeMessage}" th:class="${#strings.contains(changeMessage, 'Successfully') or #strings.contains(changeMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
+                <span th:text="#{${changeMessage}}">Default message if not found</span>
+              </div>
+              
+              <div th:if="${deleteMessage}" th:class="${#strings.contains(deleteMessage, 'Successfully') or #strings.contains(deleteMessage, 'Created') ? 'alert alert-success data-mb-3' : 'alert alert-danger data-mb-3'}">
                 <span th:text="#{${deleteMessage}}">Default message if not found</span>
               </div>
-              <div class="bg-card mt-3 mb-3 table-responsive">
-                <table class="table table-striped table-hover">
+              
+              <!-- Admin Actions -->
+              <div class="data-section-title">User Management</div>
+              <div class="data-actions data-mb-3">
+                <button 
+                  th:data-bs-toggle="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : 'modal'"
+                  th:data-bs-target="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? null : '#addUserModal'"
+                  th:class="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? 'data-btn data-btn-danger' : 'data-btn data-btn-primary'"
+                  th:title="${@runningProOrHigher && totalUsers >= maxPaidUsers} ? #{adminUserSettings.maxUsersReached} : #{adminUserSettings.addUser}">
+                  <span class="material-symbols-rounded">person_add</span>
+                  <span th:text="#{adminUserSettings.addUser}">Add New User</span>
+                </button>
+                
+                <a href="/teams" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.teams}">
+                  <span class="material-symbols-rounded">group</span>
+                  <span th:text="#{adminUserSettings.teams}">Manage Teams</span>
+                </a>
+                
+                <button 
+                  data-bs-toggle="modal" 
+                  data-bs-target="#changeUserRoleModal" 
+                  class="data-btn data-btn-secondary" 
+                  th:title="#{adminUserSettings.changeUserRole}">
+                  <span class="material-symbols-rounded">edit</span>
+                  <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
+                </button>
+                
+                <a href="/usage" th:if="${@runningEE}" class="data-btn data-btn-secondary" th:title="#{adminUserSettings.usage}">
+                  <span class="material-symbols-rounded">analytics</span>
+                  <span th:text="#{adminUserSettings.usage}">Usage Statistics</span>
+                </a>
+              </div>
+              
+              <!-- Users Table -->
+              <div class="table-responsive">
+                <table class="data-table">
                   <thead>
                     <tr>
                       <th scope="col">#</th>
                       <th scope="col" th:title="#{username}" th:text="#{username}">Username</th>
+                      <th scope="col" th:title="#{adminUserSettings.team}" th:text="#{adminUserSettings.team}">Team</th>
                       <th scope="col" th:title="#{adminUserSettings.roles}" th:text="#{adminUserSettings.roles}">Roles</th>
                       <th scope="col" th:title="#{adminUserSettings.authenticated}" class="text-overflow" th:text="#{adminUserSettings.authenticated}">Authenticated</th>
                       <th scope="col" th:title="#{adminUserSettings.lastRequest}" class="text-overflow" th:text="#{adminUserSettings.lastRequest}">Last Request</th>
-                      <th scope="col" th:title="#{adminUserSettings.actions}" th:text="#{adminUserSettings.actions}" colspan="2">Actions</th>
-                      <!-- <th scope="col"></th> -->
+                      <th scope="col" th:title="#{adminUserSettings.actions}" th:text="#{adminUserSettings.actions}">Actions</th>
                     </tr>
                   </thead>
                   <tbody>
                     <tr th:each="user : ${users}">
-                      <th scope="row" style="align-content: center;" th:text="${user.id}"></th>
-                      <td style="align-content: center;" th:text="${user.username}" th:classappend="${userSessions[user.username] ? 'active-user' : ''}"></td>
-                      <td style="align-content: center;" th:text="#{${user.roleName}}"></td>
-                      <td style="align-content: center;" th:text="${user.authenticationType}"></td>
-                      <td style="align-content: center;" th:text="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}"></td>
-                      <td style="align-content: center;">
-                        <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post" onsubmit="return confirmDeleteUser()">
-                          <button type="submit" th:title="#{adminUserSettings.deleteUser}" class="btn btn-info btn-sm"><span class="material-symbols-rounded">person_remove</span></button>
-                        </form>
-                        <a th:if="${user.username == currentUsername}" th:title="#{adminUserSettings.editOwnProfil}" th:href="@{'/account'}" class="btn btn-outline-success btn-sm"><span class="material-symbols-rounded">edit</span></a>
+                      <td th:text="${user.id}"></td>
+                      <td th:text="${user.username}" th:classappend="${userSessions[user.username] ? 'active-user' : ''}"></td>
+                      <td th:text="${user.team != null ? user.team.name : '—'}"></td>
+                      <td>
+                        <span class="data-badge" style="background-color: var(--md-sys-color-secondary-container); color: var(--md-sys-color-secondary); padding: 0.25rem 0.5rem; border-radius: 1rem; font-size: 0.875rem; display: inline-flex; align-items: center; gap: 0.25rem;">
+                          <span class="material-symbols-rounded" style="font-size: 1rem;">shield</span>
+                          <span th:text="#{${user.roleName}}">Role</span>
+                        </span>
                       </td>
-                      <td style="align-content: center;">
-                        <form th:action="@{'/api/v1/user/admin/changeUserEnabled/' + ${user.username}}" method="post" onsubmit="return confirmChangeUserStatus()">
-                          <input type="hidden" name="enabled" th:value="!${user.enabled}" />
-                          <button type="submit" th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" class="btn btn-success btn-sm">
-                            <span class="material-symbols-rounded">person</span>
-                          </button>
-                          <button type="submit" th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" class="btn btn-danger btn-sm">
-                            <span class="material-symbols-rounded">person_off</span>
-                          </button>
-                        </form>
+                      <td th:text="${user.authenticationType}"></td>
+                      <td th:text="${userLastRequest[user.username] != null ? #dates.format(userLastRequest[user.username], 'yyyy-MM-dd HH:mm:ss') : 'N/A'}"></td>
+                      <td>
+                        <div class="data-action-cell">
+                          <form th:if="${user.username != currentUsername}" th:action="@{'/api/v1/user/admin/deleteUser/' + ${user.username}}" method="post" onsubmit="return confirmDeleteUser()" style="display: inline;">
+                            <button type="submit" th:title="#{adminUserSettings.deleteUser}" class="data-icon-btn data-icon-btn-danger">
+                              <span class="material-symbols-rounded">person_remove</span>
+                            </button>
+                          </form>
+                          
+                          <a th:if="${user.username == currentUsername}" th:title="#{adminUserSettings.editOwnProfil}" th:href="@{'/account'}" class="data-icon-btn data-icon-btn-primary">
+                            <span class="material-symbols-rounded">edit</span>
+                          </a>
+                          
+                          <form th:action="@{'/api/v1/user/admin/changeUserEnabled/' + ${user.username}}" method="post" onsubmit="return confirmChangeUserStatus()" style="display: inline;">
+                            <input type="hidden" name="enabled" th:value="!${user.enabled}" />
+                            <button type="submit" th:if="${user.enabled}" th:title="#{adminUserSettings.enabledUser}" class="data-icon-btn data-icon-btn-primary">
+                              <span class="material-symbols-rounded">person</span>
+                            </button>
+                            <button type="submit" th:unless="${user.enabled}" th:title="#{adminUserSettings.disabledUser}" class="data-icon-btn data-icon-btn-danger">
+                              <span class="material-symbols-rounded">person_off</span>
+                            </button>
+                          </form>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
                 </table>
               </div>
-              <p th:if="${!@runningProOrHigher}" th:text="#{enterpriseEdition.ssoAdvert}"></p>
-
-              <script th:inline="javascript">
-                const delete_confirm_text = /*[[#{adminUserSettings.confirmDeleteUser}]]*/ 'Should the user be deleted?';
-                const change_confirm_text = /*[[#{adminUserSettings.confirmChangeUserStatus}]]*/ 'Should the user be disabled/enabled?';
-                function confirmDeleteUser() {
-                  return confirm(delete_confirm_text);
-                }
-                function confirmChangeUserStatus() {
-                  return confirm(change_confirm_text);
-                }
-              </script>
+              
+              <p th:if="${!@runningProOrHigher}" class="data-mt-3" th:text="#{enterpriseEdition.ssoAdvert}"></p>
             </div>
           </div>
         </div>
       </div>
 
-      <!-- change User role Modal start -->
+      <!-- Change User Role Modal -->
       <div class="modal fade" id="changeUserRoleModal" tabindex="-1" aria-labelledby="changeUserRoleModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h2 th:text="#{adminUserSettings.changeUserRole}">Change User's Role</h2>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+        <div class="modal-dialog modal-dialog-centered">
+          <form th:action="@{'/api/v1/user/admin/changeRole'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">edit</span>
+                </span>
+                <span th:text="#{adminUserSettings.changeUserRole}">Change User's Role</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
                 <span class="material-symbols-rounded">close</span>
               </button>
             </div>
-            <div class="modal-body">
-              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" th:text="#{help}">Help</button>
-              <form th:action="@{'/api/v1/user/admin/changeRole'}" method="post">
-                <div class="mb-3">
-                  <label for="username" th:text="#{username}">Username</label>
-                  <select name="username" class="form-control" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="user : ${users}" th:if="${user.username != currentUsername}" th:value="${user.username}" th:text="${user.username}">Username</option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
-                  <select name="role" class="form-control" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
-                  </select>
-                </div>
-
-                <!-- Add other fields as required -->
-                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
-              </form>
+            <div class="data-modal-body">
+              <div class="data-mb-2">
+                <button class="data-btn data-btn-secondary" data-toggle="tooltip" data-placement="auto" th:title="#{downgradeCurrentUserLongMessage}" style="padding: 0.25rem 0.5rem;">
+                  <span class="material-symbols-rounded">help</span>
+                  <span th:text="#{help}">Help</span>
+                </button>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="username" class="data-form-label" th:text="#{username}">Username</label>
+                <select name="username" id="username" class="data-form-control" required>
+                  <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                  <option th:each="user : ${users}" th:if="${user.username != currentUsername}" th:value="${user.username}" th:text="${user.username}">Username</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="role" class="data-form-label" th:text="#{adminUserSettings.role}">Role</label>
+                <select name="role" id="role" class="data-form-control" required>
+                  <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                  <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="team" class="data-form-label" th:text="#{adminUserSettings.team}">Team</label>
+                <select name="teamId" id="team" class="data-form-control" required>
+                  <option value="" th:text="#{selectFillter}">-- Select --</option>
+                  <option th:each="team : ${teams}" th:value="${team.id}" th:text="${team.name}"></option>
+                </select>
+              </div>
+              
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Save User</span>
+                </button>
+              </div>
             </div>
-            <div class="modal-footer"></div>
-          </div>
+          </form>
         </div>
       </div>
-      <!-- change User role Modal end -->
 
-      <!-- Add User Modal start -->
-      <div class="modal fade" id="addUserModal" tabindex="-1" aria-labelledby="addUserModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title" id="addUserModalLabel" th:text="#{adminUserSettings.addUser}">Add New User</h5>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
+      <!-- Add User Modal -->
+      <div class="modal fade" id="addUserModal" tabindex="-1" style="z-index: 10000;" aria-labelledby="addUserModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">person_add</span>
+                </span>
+                <span th:text="#{adminUserSettings.addUser}">Add New User</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
                 <span class="material-symbols-rounded">close</span>
               </button>
             </div>
-            <div class="modal-body">
-              <button class="btn btn-outline-info" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" th:text="#{help}">Help</button>
-              <form id="formsaveuser" th:action="@{'/api/v1/user/admin/saveUser'}" method="post">
-                <div class="mb-3">
-                  <label for="username" th:text="#{username}">Username</label>
-                  <input type="text" class="form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
-                  <span id="usernameError" style="display: none;" th:text="#{invalidUsernameMessage}">Invalid username!</span>
-                </div>
-                <div class="mb-3" id="passwordContainer">
-                  <label for="password" th:text="#{password}">Password</label>
-                  <input type="password" class="form-control" name="password" id="password" required>
-                </div>
-                <div class="mb-3">
-                  <label for="role" th:text="#{adminUserSettings.role}">Role</label>
-                  <select name="role" class="form-control" id="role" required>
-                    <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
-                    <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
-                  </select>
-                </div>
-                <div class="mb-3">
-                  <label for="authType">Authentication Type</label>
-                  <select id="authType" name="authType" class="form-control" required>
-                    <option value="web" selected>WEB</option>
-                    <option value="sso">SSO</option>
-                  </select>
-                </div>
-                <div class="form-check mb-3" id="checkboxContainer">
+            <div class="data-modal-body">
+              <div class="data-mb-2">
+                <button class="data-btn data-btn-secondary" data-toggle="tooltip" data-placement="auto" th:title="#{adminUserSettings.usernameInfo}" style="padding: 0.25rem 0.5rem;">
+                  <span class="material-symbols-rounded">help</span>
+                  <span th:text="#{help}">Help</span>
+                </button>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="username" class="data-form-label" th:text="#{username}">Username</label>
+                <input type="text" class="data-form-control" name="username" id="username" th:title="#{adminUserSettings.usernameInfo}" required>
+                <span id="usernameError" style="display: none; color: var(--md-sys-color-error);" th:text="#{invalidUsernameMessage}">Invalid username!</span>
+              </div>
+              
+              <div class="data-form-group" id="passwordContainer">
+                <label for="password" class="data-form-label" th:text="#{password}">Password</label>
+                <input type="password" class="data-form-control" name="password" id="password" required>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="role" class="data-form-label" th:text="#{adminUserSettings.role}">Role</label>
+                <select name="role" class="data-form-control" id="role" required>
+                  <option value="" disabled selected th:text="#{selectFillter}">-- Select --</option>
+                  <option th:each="roleDetail : ${roleDetails}" th:value="${roleDetail.key}" th:text="#{${roleDetail.value}}">Role</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="team" class="data-form-label" th:text="#{adminUserSettings.team}">Team</label>
+                <select name="teamId" class="data-form-control" required>
+                  <option value="" th:text="#{selectFillter}">-- Select --</option>
+                  <option th:each="team : ${teams}" th:value="${team.id}" th:text="${team.name}"></option>
+                </select>
+              </div>
+              
+              <div class="data-form-group">
+                <label for="authType" class="data-form-label">Authentication Type</label>
+                <select id="authType" name="authType" class="data-form-control" required>
+                  <option value="web" selected>WEB</option>
+                  <option value="sso">SSO</option>
+                </select>
+              </div>
+              
+              <div class="data-form-group" id="checkboxContainer">
+                <div class="form-check">
                   <input type="checkbox" class="form-check-input" id="forceChange" name="forceChange">
                   <label class="form-check-label" for="forceChange" th:text="#{adminUserSettings.forceChange}">Force user to change username/password on login</label>
                 </div>
-                <button type="submit" class="btn btn-primary" th:text="#{adminUserSettings.submit}">Save User</button>
-              </form>
+              </div>
+              
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Save User</span>
+                </button>
+              </div>
             </div>
-            <div class="modal-footer"></div>
-          </div>
+          </form>
+        </div>
+      </div>
+
+      <!-- Add Team Modal -->
+      <div class="modal fade" id="addTeamModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+          <form th:action="@{'/api/v1/team/create'}" method="post" class="modal-content data-modal">
+            <div class="data-modal-header">
+              <h5 class="data-modal-title">
+                <span class="data-icon">
+                  <span class="material-symbols-rounded">group_add</span>
+                </span>
+                <span th:text="#{adminUserSettings.createTeam}">Create Team</span>
+              </h5>
+              <button type="button" class="data-btn-close" data-bs-dismiss="modal" aria-label="Close">
+                <span class="material-symbols-rounded">close</span>
+              </button>
+            </div>
+            <div class="data-modal-body">
+              <div class="data-form-group">
+                <label for="teamName" class="data-form-label" th:text="#{adminUserSettings.teamName}">Team Name</label>
+                <input type="text" name="name" id="teamName" class="data-form-control" required />
+              </div>
+              <div class="data-form-actions">
+                <button type="button" class="data-btn data-btn-secondary" data-bs-dismiss="modal">
+                  <span class="material-symbols-rounded">close</span>
+                  <span th:text="#{cancel}">Cancel</span>
+                </button>
+                <button type="submit" class="data-btn data-btn-primary">
+                  <span class="material-symbols-rounded">check</span>
+                  <span th:text="#{adminUserSettings.submit}">Create</span>
+                </button>
+              </div>
+            </div>
+          </form>
         </div>
       </div>
-      <!-- Add User Modal end -->
 
       <script th:inline="javascript">
+        const delete_confirm_text = /*[[#{adminUserSettings.confirmDeleteUser}]]*/ 'Should the user be deleted?';
+        const change_confirm_text = /*[[#{adminUserSettings.confirmChangeUserStatus}]]*/ 'Should the user be disabled/enabled?';
+        
+        function confirmDeleteUser() {
+          return confirm(delete_confirm_text);
+        }
+        
+        function confirmChangeUserStatus() {
+          return confirm(change_confirm_text);
+        }
+        
         jQuery.validator.addMethod("usernamePattern", function(value, element) {
           // Regular expression for user name: Min. 3 characters, max. 50 characters
           const regexUsername = /^[a-zA-Z0-9](?!.*[-@._+]{2,})([a-zA-Z0-9@._+-]{1,48})[a-zA-Z0-9]$/;
@@ -241,6 +381,7 @@
           // Check if the field is optional or meets the requirements
           return this.optional(element) || regexUsername.test(value) || regexEmail.test(value);
         }, /*[[#{invalidUsernameMessage}]]*/ "Invalid username format");
+        
         $(document).ready(function() {
           $('[data-toggle="tooltip"]').tooltip();
 
@@ -261,9 +402,9 @@
               }
             },
             messages: {
-                username: {
-                    usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
-                },
+              username: {
+                usernamePattern: /*[[#{invalidUsernameMessage}]]*/ "Invalid username format"
+              },
             },
             errorPlacement: function(error, element) {
               if (element.attr("name") === "username") {
@@ -280,40 +421,40 @@
           });
 
           $('#username').on('input', function() {
-              var usernameInput = $(this);
-              var isValid = usernameInput[0].checkValidity();
-              var errorSpan = $('#usernameError');
+            var usernameInput = $(this);
+            var isValid = usernameInput[0].checkValidity();
+            var errorSpan = $('#usernameError');
 
-              if (isValid) {
-                  usernameInput.removeClass('invalid').addClass('valid');
-                  errorSpan.hide();
-              } else {
-                  usernameInput.removeClass('valid').addClass('invalid');
-                  errorSpan.show();
-              }
+            if (isValid) {
+              usernameInput.removeClass('invalid').addClass('valid');
+              errorSpan.hide();
+            } else {
+              usernameInput.removeClass('valid').addClass('invalid');
+              errorSpan.show();
+            }
           });
 
           $('#authType').on('change', function() {
-              var authType = $(this).val();
-              var passwordField = $('#password');
-              var passwordFieldContainer = $('#passwordContainer');
-              var checkboxContainer = $('#checkboxContainer');
+            var authType = $(this).val();
+            var passwordField = $('#password');
+            var passwordFieldContainer = $('#passwordContainer');
+            var checkboxContainer = $('#checkboxContainer');
 
-              if (authType === 'sso') {
-                  passwordField.removeAttr('required');
-                  passwordField.prop('disabled', true).val('');
-                  passwordFieldContainer.slideUp('fast');
-                  checkboxContainer.slideUp('fast');
-              } else {
-                  passwordField.prop('disabled', false);
-                  passwordField.attr('required', 'required');
-                  passwordFieldContainer.slideDown('fast');
-                  checkboxContainer.slideDown('fast');
-              }
+            if (authType === 'sso') {
+              passwordField.removeAttr('required');
+              passwordField.prop('disabled', true).val('');
+              passwordFieldContainer.slideUp('fast');
+              checkboxContainer.slideUp('fast');
+            } else {
+              passwordField.prop('disabled', false);
+              passwordField.attr('required', 'required');
+              passwordFieldContainer.slideDown('fast');
+              checkboxContainer.slideDown('fast');
+            }
           });
         });
       </script>
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

stirling-pdf/src/main/resources/templates/edit-table-of-contents.html

@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
+  <th:block th:insert="~{fragments/common :: head(title=#{editTableOfContents.title}, header=#{editTableOfContents.header})}">
+  </th:block>
+  <link rel="stylesheet" th:href="@{'/css/edit-table-of-contents.css'}">
+</head>
+
+<body>
+  <div id="page-container">
+    <div id="content-wrap">
+      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+      <br><br>
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-md-8 bg-card">
+            <div class="tool-header">
+              <span class="material-symbols-rounded tool-header-icon edit">bookmark_add</span>
+              <span class="tool-header-text" th:text="#{editTableOfContents.header}"></span>
+            </div>
+            <form th:action="@{'/api/v1/general/edit-table-of-contents'}" method="post" enctype="multipart/form-data" id="editTocForm">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+
+              <div class="mb-3 form-check">
+                <input type="checkbox" class="form-check-input" id="replaceExisting" name="replaceExisting" checked>
+                <label class="form-check-label" for="replaceExisting"
+                  th:text="#{editTableOfContents.replaceExisting}"></label>
+                <input type="hidden" name="replaceExisting" value="false" />
+              </div>
+
+              <div class="bookmark-editor">
+                <h5 th:text="#{editTableOfContents.editorTitle}"></h5>
+                <p th:text="#{editTableOfContents.editorDesc}"></p>
+                
+                <div id="bookmarks-container">
+                  <!-- Bookmarks will be added here dynamically -->
+                </div>
+                
+                <div class="bookmark-actions">
+                  <button type="button" id="addBookmarkBtn" class="btn btn-outline-primary" th:text="#{editTableOfContents.addBookmark}"></button>
+                </div>
+                
+                <!-- Hidden field to store JSON data -->
+                <input type="hidden" id="bookmarkData" name="bookmarkData" value="[]">
+              </div>
+
+              <p>
+                <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#info" role="button"
+                  aria-expanded="false" aria-controls="info" th:text="#{info}"></a>
+              </p>
+              <div class="collapse" id="info">
+                <p th:text="#{editTableOfContents.desc.1}"></p>
+                <p th:text="#{editTableOfContents.desc.2}"></p>
+                <p th:text="#{editTableOfContents.desc.3}"></p>
+              </div>
+
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{editTableOfContents.submit}"></button>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+
+  <script th:src="@{'/js/pages/edit-table-of-contents.js'}"></script>
+  <script>
+    document.addEventListener('DOMContentLoaded', function() {
+      // Initialize Bootstrap tooltips
+      if (typeof $ !== 'undefined') {
+        $('[data-bs-toggle="tooltip"]').tooltip();
+      }
+    });
+  </script>
+</body>
+
+</html>

stirling-pdf/src/main/resources/templates/fragments/navElements.html

@@ -277,6 +277,9 @@
       <div
         th:replace="~{fragments/navbarEntry :: navbarEntry('split-pdf-by-sections', 'grid_on', 'home.split-by-sections.title', 'home.split-by-sections.desc', 'split-by-sections.tags', 'advance')}">
       </div>
+      <div
+        th:replace="~{fragments/navbarEntry :: navbarEntry('edit-table-of-contents', 'bookmark_add', 'home.editTableOfContents.title', 'home.editTableOfContents.desc', 'editTableOfContents.tags', 'advance')}">
+      </div>
       <div
         th:replace="~{fragments/navbarEntryCustom :: navbarEntry('split-pdf-by-chapters', '/images/split-chapters.svg#icon-split-chapters', 'home.splitPdfByChapters.title', 'home.splitPdfByChapters.desc', 'splitPdfByChapters.tags', 'advance')}">
       </div>

stirling-pdf/src/main/resources/templates/fragments/navbarEntry.html

@@ -1,18 +1,18 @@
 <th:block th:fragment="navbarEntry(endpoint, toolIcon, titleKey, descKey, tagKey, toolGroup)"
-          th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
+th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
   <a th:id="@{${endpoint}}" class="dropdown-item" style="position:relative" th:href="@{${endpoint}}"
-     th:data-bs-link="@{${endpoint}}"
-     th:classappend="${endpoint.equals(currentPage)} ?  ${toolGroup} + ' active' : '' + ${toolGroup}"
-     th:data-bs-tags="#{${tagKey}}" th:data-bs-title='#{${titleKey}}'>
+    th:data-bs-link="@{${endpoint}}"
+    th:classappend="${endpoint.equals(currentPage)} ?  ${toolGroup} + ' active' : '' + ${toolGroup}"
+    th:data-bs-tags="#{${tagKey}}" th:data-bs-title='#{${titleKey}}'>
     <div style="min-height:2.7rem; align-items: center;display: flex;" th:title="#{${descKey}}" class="icon" alt="icon"
-         th:class="@{${toolGroup}}">
+      th:class="@{${toolGroup}}">
       <span class="material-symbols-rounded nav-icon" th:text="@{${toolIcon}}" style=" align-items:center; display: flex; justify-content: center; height:2.7rem; width:2.7rem"></span>
       <span class="icon-text" th:text="#{${titleKey}}"></span>
     </div>
     <span class="material-symbols-rounded favorite-icon" style="display: none;" th:data-endpoint="@{${endpoint}}"
-          th:onclick="'addToFavorites(\'' + @{${endpoint}} + '\')'">
+      th:onclick="'addToFavorites(\'' + @{${endpoint}} + '\')'">
       add
     </span>
   </a>
 
-</th:block>
+</th:block>

stirling-pdf/src/main/resources/templates/home.html

@@ -45,6 +45,9 @@
                       <div class="newfeature"
                         th:insert="~{fragments/navbarEntry :: navbarEntry('compress-pdf', 'zoom_in_map', 'home.compressPdfs.title', 'home.compressPdfs.desc', 'compressPDFs.tags', 'advance')}">
                       </div>
+                      <div class="newfeature"
+                        th:insert="~{fragments/navbarEntry :: navbarEntry('edit-table-of-contents', 'bookmark_add', 'home.editTableOfContents.title', 'home.editTableOfContents.desc', 'editTableOfContents.tags', 'advance')}">
+                      </div>
                     </div>
                   </div>
                 </div>

stirling-pdf/src/main/resources/templates/merge-pdfs.html

@@ -32,6 +32,10 @@
                 <label for="removeCertSign" th:text="#{merge.removeCertSign}">Remove digital signature in the merged
                   file?</label>
               </div>
+              <div class="mb-3">
+                <input type="checkbox" name="generateToc" id="generateToc">
+                <label for="generateToc" th:text="#{merge.generateToc}">Generate table of contents in the merged file?</label>
+              </div>
               <div class="mb-3">
                 <ul id="selectedFiles" class="list-group"></ul>
               </div>

stirling-pdf/src/main/resources/templates/security/get-info-on-pdf.html

@@ -591,4 +591,4 @@
       <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
   </body>
-</html>
+</html>

stirling-pdf/src/test/java/stirling/software/SPDF/controller/api/EditTableOfContentsControllerTest.java

@@ -0,0 +1,382 @@
+package stirling.software.SPDF.controller.api;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+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.interactive.documentnavigation.outline.PDDocumentOutline;
+import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.ResponseEntity;
+import org.springframework.mock.web.MockMultipartFile;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import stirling.software.SPDF.controller.api.EditTableOfContentsController.BookmarkItem;
+import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@ExtendWith(MockitoExtension.class)
+class EditTableOfContentsControllerTest {
+
+    @Mock
+    private CustomPDFDocumentFactory pdfDocumentFactory;
+
+    @Mock
+    private ObjectMapper objectMapper;
+
+    @InjectMocks
+    private EditTableOfContentsController editTableOfContentsController;
+
+    private MockMultipartFile mockFile;
+    private PDDocument mockDocument;
+    private PDDocumentCatalog mockCatalog;
+    private PDPageTree mockPages;
+    private PDPage mockPage1;
+    private PDPage mockPage2;
+    private PDDocumentOutline mockOutline;
+    private PDOutlineItem mockOutlineItem;
+
+    @BeforeEach
+    void setUp() {
+        mockFile = new MockMultipartFile("file", "test.pdf", "application/pdf", "PDF content".getBytes());
+        mockDocument = mock(PDDocument.class);
+        mockCatalog = mock(PDDocumentCatalog.class);
+        mockPages = mock(PDPageTree.class);
+        mockPage1 = mock(PDPage.class);
+        mockPage2 = mock(PDPage.class);
+        mockOutline = mock(PDDocumentOutline.class);
+        mockOutlineItem = mock(PDOutlineItem.class);
+    }
+
+    @Test
+    void testExtractBookmarks_WithExistingBookmarks_Success() throws Exception {
+        // Given
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockCatalog.getDocumentOutline()).thenReturn(mockOutline);
+        when(mockOutline.getFirstChild()).thenReturn(mockOutlineItem);
+
+        when(mockOutlineItem.getTitle()).thenReturn("Chapter 1");
+        when(mockOutlineItem.findDestinationPage(mockDocument)).thenReturn(mockPage1);
+        when(mockDocument.getPages()).thenReturn(mockPages);
+        when(mockPages.indexOf(mockPage1)).thenReturn(0);
+        when(mockOutlineItem.getFirstChild()).thenReturn(null);
+        when(mockOutlineItem.getNextSibling()).thenReturn(null);
+
+        // When
+        List<Map<String, Object>> result = editTableOfContentsController.extractBookmarks(mockFile);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(1, result.size());
+
+        Map<String, Object> bookmark = result.get(0);
+        assertEquals("Chapter 1", bookmark.get("title"));
+        assertEquals(1, bookmark.get("pageNumber")); // 1-based
+        assertInstanceOf(List.class, bookmark.get("children"));
+
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testExtractBookmarks_NoOutline_ReturnsEmptyList() throws Exception {
+        // Given
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockCatalog.getDocumentOutline()).thenReturn(null);
+
+        // When
+        List<Map<String, Object>> result = editTableOfContentsController.extractBookmarks(mockFile);
+
+        // Then
+        assertNotNull(result);
+        assertTrue(result.isEmpty());
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testExtractBookmarks_WithNestedBookmarks_Success() throws Exception {
+        // Given
+        PDOutlineItem childItem = mock(PDOutlineItem.class);
+
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockCatalog.getDocumentOutline()).thenReturn(mockOutline);
+        when(mockOutline.getFirstChild()).thenReturn(mockOutlineItem);
+
+        // Parent bookmark
+        when(mockOutlineItem.getTitle()).thenReturn("Chapter 1");
+        when(mockOutlineItem.findDestinationPage(mockDocument)).thenReturn(mockPage1);
+        when(mockDocument.getPages()).thenReturn(mockPages);
+        when(mockPages.indexOf(mockPage1)).thenReturn(0);
+        when(mockOutlineItem.getFirstChild()).thenReturn(childItem);
+        when(mockOutlineItem.getNextSibling()).thenReturn(null);
+
+        // Child bookmark
+        when(childItem.getTitle()).thenReturn("Section 1.1");
+        when(childItem.findDestinationPage(mockDocument)).thenReturn(mockPage2);
+        when(mockPages.indexOf(mockPage2)).thenReturn(1);
+        when(childItem.getFirstChild()).thenReturn(null);
+        when(childItem.getNextSibling()).thenReturn(null);
+
+        // When
+        List<Map<String, Object>> result = editTableOfContentsController.extractBookmarks(mockFile);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(1, result.size());
+
+        Map<String, Object> parentBookmark = result.get(0);
+        assertEquals("Chapter 1", parentBookmark.get("title"));
+        assertEquals(1, parentBookmark.get("pageNumber"));
+
+        @SuppressWarnings("unchecked")
+        List<Map<String, Object>> children = (List<Map<String, Object>>) parentBookmark.get("children");
+        assertEquals(1, children.size());
+
+        Map<String, Object> childBookmark = children.get(0);
+        assertEquals("Section 1.1", childBookmark.get("title"));
+        assertEquals(2, childBookmark.get("pageNumber"));
+
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testExtractBookmarks_PageNotFound_UsesPageOne() throws Exception {
+        // Given
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockCatalog.getDocumentOutline()).thenReturn(mockOutline);
+        when(mockOutline.getFirstChild()).thenReturn(mockOutlineItem);
+
+        when(mockOutlineItem.getTitle()).thenReturn("Chapter 1");
+        when(mockOutlineItem.findDestinationPage(mockDocument)).thenReturn(null); // Page not found
+        when(mockOutlineItem.getFirstChild()).thenReturn(null);
+        when(mockOutlineItem.getNextSibling()).thenReturn(null);
+
+        // When
+        List<Map<String, Object>> result = editTableOfContentsController.extractBookmarks(mockFile);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(1, result.size());
+
+        Map<String, Object> bookmark = result.get(0);
+        assertEquals("Chapter 1", bookmark.get("title"));
+        assertEquals(1, bookmark.get("pageNumber")); // Default to page 1
+
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testEditTableOfContents_Success() throws Exception {
+        // Given
+        EditTableOfContentsRequest request = new EditTableOfContentsRequest();
+        request.setFileInput(mockFile);
+        request.setBookmarkData("[{\"title\":\"Chapter 1\",\"pageNumber\":1,\"children\":[]}]");
+        request.setReplaceExisting(true);
+
+        List<BookmarkItem> bookmarks = new ArrayList<>();
+        BookmarkItem bookmark = new BookmarkItem();
+        bookmark.setTitle("Chapter 1");
+        bookmark.setPageNumber(1);
+        bookmark.setChildren(new ArrayList<>());
+        bookmarks.add(bookmark);
+
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(objectMapper.readValue(eq(request.getBookmarkData()), any(TypeReference.class))).thenReturn(bookmarks);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockDocument.getNumberOfPages()).thenReturn(5);
+        when(mockDocument.getPage(0)).thenReturn(mockPage1);
+
+        // Mock saving behavior
+        doAnswer(invocation -> {
+            ByteArrayOutputStream baos = invocation.getArgument(0);
+            baos.write("mocked pdf content".getBytes());
+            return null;
+        }).when(mockDocument).save(any(ByteArrayOutputStream.class));
+
+        // When
+        ResponseEntity<byte[]> result = editTableOfContentsController.editTableOfContents(request);
+
+        // Then
+        assertNotNull(result);
+        assertNotNull(result.getBody());
+
+        ArgumentCaptor<PDDocumentOutline> outlineCaptor = ArgumentCaptor.forClass(PDDocumentOutline.class);
+        verify(mockCatalog).setDocumentOutline(outlineCaptor.capture());
+
+        PDDocumentOutline capturedOutline = outlineCaptor.getValue();
+        assertNotNull(capturedOutline);
+
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testEditTableOfContents_WithNestedBookmarks_Success() throws Exception {
+        // Given
+        EditTableOfContentsRequest request = new EditTableOfContentsRequest();
+        request.setFileInput(mockFile);
+
+        String bookmarkJson = "[{\"title\":\"Chapter 1\",\"pageNumber\":1,\"children\":[{\"title\":\"Section 1.1\",\"pageNumber\":2,\"children\":[]}]}]";
+        request.setBookmarkData(bookmarkJson);
+
+        List<BookmarkItem> bookmarks = new ArrayList<>();
+        BookmarkItem parentBookmark = new BookmarkItem();
+        parentBookmark.setTitle("Chapter 1");
+        parentBookmark.setPageNumber(1);
+
+        BookmarkItem childBookmark = new BookmarkItem();
+        childBookmark.setTitle("Section 1.1");
+        childBookmark.setPageNumber(2);
+        childBookmark.setChildren(new ArrayList<>());
+
+        List<BookmarkItem> children = new ArrayList<>();
+        children.add(childBookmark);
+        parentBookmark.setChildren(children);
+        bookmarks.add(parentBookmark);
+
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(objectMapper.readValue(eq(bookmarkJson), any(TypeReference.class))).thenReturn(bookmarks);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockDocument.getNumberOfPages()).thenReturn(5);
+        when(mockDocument.getPage(0)).thenReturn(mockPage1);
+        when(mockDocument.getPage(1)).thenReturn(mockPage2);
+
+        doAnswer(invocation -> {
+            ByteArrayOutputStream baos = invocation.getArgument(0);
+            baos.write("mocked pdf content".getBytes());
+            return null;
+        }).when(mockDocument).save(any(ByteArrayOutputStream.class));
+
+        // When
+        ResponseEntity<byte[]> result = editTableOfContentsController.editTableOfContents(request);
+
+        // Then
+        assertNotNull(result);
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testEditTableOfContents_PageNumberBounds_ClampsValues() throws Exception {
+        // Given
+        EditTableOfContentsRequest request = new EditTableOfContentsRequest();
+        request.setFileInput(mockFile);
+        request.setBookmarkData("[{\"title\":\"Chapter 1\",\"pageNumber\":-5,\"children\":[]},{\"title\":\"Chapter 2\",\"pageNumber\":100,\"children\":[]}]");
+
+        List<BookmarkItem> bookmarks = new ArrayList<>();
+
+        BookmarkItem bookmark1 = new BookmarkItem();
+        bookmark1.setTitle("Chapter 1");
+        bookmark1.setPageNumber(-5); // Negative page number
+        bookmark1.setChildren(new ArrayList<>());
+
+        BookmarkItem bookmark2 = new BookmarkItem();
+        bookmark2.setTitle("Chapter 2");
+        bookmark2.setPageNumber(100); // Page number exceeds document pages
+        bookmark2.setChildren(new ArrayList<>());
+
+        bookmarks.add(bookmark1);
+        bookmarks.add(bookmark2);
+
+        when(pdfDocumentFactory.load(mockFile)).thenReturn(mockDocument);
+        when(objectMapper.readValue(eq(request.getBookmarkData()), any(TypeReference.class))).thenReturn(bookmarks);
+        when(mockDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockDocument.getNumberOfPages()).thenReturn(5);
+        when(mockDocument.getPage(0)).thenReturn(mockPage1); // For negative page number
+        when(mockDocument.getPage(4)).thenReturn(mockPage2); // For page number exceeding bounds
+
+        doAnswer(invocation -> {
+            ByteArrayOutputStream baos = invocation.getArgument(0);
+            baos.write("mocked pdf content".getBytes());
+            return null;
+        }).when(mockDocument).save(any(ByteArrayOutputStream.class));
+
+        // When
+        ResponseEntity<byte[]> result = editTableOfContentsController.editTableOfContents(request);
+
+        // Then
+        assertNotNull(result);
+        verify(mockDocument).getPage(0); // Clamped to first page
+        verify(mockDocument).getPage(4); // Clamped to last page
+        verify(mockDocument).close();
+    }
+
+    @Test
+    void testCreateOutlineItem_ValidPageNumber_Success() throws Exception {
+        // Given
+        BookmarkItem bookmark = new BookmarkItem();
+        bookmark.setTitle("Test Chapter");
+        bookmark.setPageNumber(3);
+
+        when(mockDocument.getNumberOfPages()).thenReturn(5);
+        when(mockDocument.getPage(2)).thenReturn(mockPage1); // 0-indexed
+
+        // When
+        Method createOutlineItemMethod = EditTableOfContentsController.class.getDeclaredMethod("createOutlineItem", PDDocument.class, BookmarkItem.class);
+        createOutlineItemMethod.setAccessible(true);
+        PDOutlineItem result = (PDOutlineItem) createOutlineItemMethod.invoke(editTableOfContentsController, mockDocument, bookmark);
+
+        // Then
+        assertNotNull(result);
+        verify(mockDocument).getPage(2);
+    }
+
+
+    @Test
+    void testBookmarkItem_GettersAndSetters() {
+        // Given
+        BookmarkItem bookmark = new BookmarkItem();
+        List<BookmarkItem> children = new ArrayList<>();
+
+        // When
+        bookmark.setTitle("Test Title");
+        bookmark.setPageNumber(5);
+        bookmark.setChildren(children);
+
+        // Then
+        assertEquals("Test Title", bookmark.getTitle());
+        assertEquals(5, bookmark.getPageNumber());
+        assertEquals(children, bookmark.getChildren());
+    }
+
+    @Test
+    void testEditTableOfContents_IOExceptionDuringLoad_ThrowsException() throws Exception {
+        // Given
+        EditTableOfContentsRequest request = new EditTableOfContentsRequest();
+        request.setFileInput(mockFile);
+
+        when(pdfDocumentFactory.load(mockFile)).thenThrow(new RuntimeException("Failed to load PDF"));
+
+        // When & Then
+        assertThrows(RuntimeException.class, () -> editTableOfContentsController.editTableOfContents(request));
+    }
+
+    @Test
+    void testExtractBookmarks_IOExceptionDuringLoad_ThrowsException() throws Exception {
+        // Given
+        when(pdfDocumentFactory.load(mockFile)).thenThrow(new RuntimeException("Failed to load PDF"));
+
+        // When & Then
+        assertThrows(RuntimeException.class, () -> editTableOfContentsController.extractBookmarks(mockFile));
+    }
+}

stirling-pdf/src/test/java/stirling/software/SPDF/controller/api/MergeControllerTest.java

@@ -0,0 +1,279 @@
+package stirling.software.SPDF.controller.api;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
+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.interactive.documentnavigation.outline.PDDocumentOutline;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@ExtendWith(MockitoExtension.class)
+class MergeControllerTest {
+
+    @Mock
+    private CustomPDFDocumentFactory pdfDocumentFactory;
+
+    @InjectMocks
+    private MergeController mergeController;
+
+    private MockMultipartFile mockFile1;
+    private MockMultipartFile mockFile2;
+    private MockMultipartFile mockFile3;
+    private PDDocument mockDocument;
+    private PDDocument mockMergedDocument;
+    private PDDocumentCatalog mockCatalog;
+    private PDPageTree mockPages;
+    private PDPage mockPage1;
+    private PDPage mockPage2;
+
+    @BeforeEach
+    void setUp() {
+        mockFile1 = new MockMultipartFile("file1", "document1.pdf", "application/pdf", "PDF content 1".getBytes());
+        mockFile2 = new MockMultipartFile("file2", "document2.pdf", "application/pdf", "PDF content 2".getBytes());
+        mockFile3 = new MockMultipartFile("file3", "chapter3.pdf", "application/pdf", "PDF content 3".getBytes());
+        
+        mockDocument = mock(PDDocument.class);
+        mockMergedDocument = mock(PDDocument.class);
+        mockCatalog = mock(PDDocumentCatalog.class);
+        mockPages = mock(PDPageTree.class);
+        mockPage1 = mock(PDPage.class);
+        mockPage2 = mock(PDPage.class);
+    }
+
+    @Test
+    void testAddTableOfContents_WithMultipleFiles_Success() throws Exception {
+        // Given
+        MultipartFile[] files = {mockFile1, mockFile2, mockFile3};
+        
+        // Mock the merged document setup
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockMergedDocument.getNumberOfPages()).thenReturn(6);
+        when(mockMergedDocument.getPage(0)).thenReturn(mockPage1);
+        when(mockMergedDocument.getPage(2)).thenReturn(mockPage2);
+        when(mockMergedDocument.getPage(4)).thenReturn(mockPage1);
+        
+        // Mock individual document loading for page count
+        PDDocument doc1 = mock(PDDocument.class);
+        PDDocument doc2 = mock(PDDocument.class);
+        PDDocument doc3 = mock(PDDocument.class);
+        
+        when(pdfDocumentFactory.load(mockFile1)).thenReturn(doc1);
+        when(pdfDocumentFactory.load(mockFile2)).thenReturn(doc2);
+        when(pdfDocumentFactory.load(mockFile3)).thenReturn(doc3);
+        
+        when(doc1.getNumberOfPages()).thenReturn(2);
+        when(doc2.getNumberOfPages()).thenReturn(2);
+        when(doc3.getNumberOfPages()).thenReturn(2);
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files);
+
+        // Then
+        ArgumentCaptor<PDDocumentOutline> outlineCaptor = ArgumentCaptor.forClass(PDDocumentOutline.class);
+        verify(mockCatalog).setDocumentOutline(outlineCaptor.capture());
+        
+        PDDocumentOutline capturedOutline = outlineCaptor.getValue();
+        assertNotNull(capturedOutline);
+        
+        // Verify that documents were loaded for page count
+        verify(pdfDocumentFactory).load(mockFile1);
+        verify(pdfDocumentFactory).load(mockFile2);
+        verify(pdfDocumentFactory).load(mockFile3);
+        
+        // Verify document closing
+        verify(doc1).close();
+        verify(doc2).close();
+        verify(doc3).close();
+    }
+
+    @Test
+    void testAddTableOfContents_WithSingleFile_Success() throws Exception {
+        // Given
+        MultipartFile[] files = {mockFile1};
+        
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockMergedDocument.getNumberOfPages()).thenReturn(3);
+        when(mockMergedDocument.getPage(0)).thenReturn(mockPage1);
+        
+        PDDocument doc1 = mock(PDDocument.class);
+        when(pdfDocumentFactory.load(mockFile1)).thenReturn(doc1);
+        when(doc1.getNumberOfPages()).thenReturn(3);
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files);
+
+        // Then
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verify(pdfDocumentFactory).load(mockFile1);
+        verify(doc1).close();
+    }
+
+    @Test
+    void testAddTableOfContents_WithEmptyArray_Success() throws Exception {
+        // Given
+        MultipartFile[] files = {};
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files);
+
+        // Then
+        verify(mockMergedDocument).getDocumentCatalog();
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verifyNoInteractions(pdfDocumentFactory);
+    }
+
+    @Test
+    void testAddTableOfContents_WithIOException_HandlesGracefully() throws Exception {
+        // Given
+        MultipartFile[] files = {mockFile1, mockFile2};
+        
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockMergedDocument.getNumberOfPages()).thenReturn(4);
+        when(mockMergedDocument.getPage(anyInt())).thenReturn(mockPage1); // Use anyInt() to avoid stubbing conflicts
+        
+        // First document loads successfully
+        PDDocument doc1 = mock(PDDocument.class);
+        when(pdfDocumentFactory.load(mockFile1)).thenReturn(doc1);
+        when(doc1.getNumberOfPages()).thenReturn(2);
+        
+        // Second document throws IOException
+        when(pdfDocumentFactory.load(mockFile2)).thenThrow(new IOException("Failed to load document"));
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        
+        // Should not throw exception
+        assertDoesNotThrow(() -> 
+            addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files)
+        );
+
+        // Then
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verify(pdfDocumentFactory).load(mockFile1);
+        verify(pdfDocumentFactory).load(mockFile2);
+        verify(doc1).close();
+    }
+
+    @Test
+    void testAddTableOfContents_FilenameWithoutExtension_UsesFullName() throws Exception {
+        // Given
+        MockMultipartFile fileWithoutExtension = new MockMultipartFile("file", "document_no_ext", "application/pdf", "PDF content".getBytes());
+        MultipartFile[] files = {fileWithoutExtension};
+        
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockMergedDocument.getNumberOfPages()).thenReturn(1);
+        when(mockMergedDocument.getPage(0)).thenReturn(mockPage1);
+        
+        PDDocument doc = mock(PDDocument.class);
+        when(pdfDocumentFactory.load(fileWithoutExtension)).thenReturn(doc);
+        when(doc.getNumberOfPages()).thenReturn(1);
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files);
+
+        // Then
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verify(doc).close();
+    }
+
+    @Test
+    void testAddTableOfContents_PageIndexExceedsDocumentPages_HandlesGracefully() throws Exception {
+        // Given
+        MultipartFile[] files = {mockFile1};
+        
+        when(mockMergedDocument.getDocumentCatalog()).thenReturn(mockCatalog);
+        when(mockMergedDocument.getNumberOfPages()).thenReturn(0); // No pages in merged document
+        
+        PDDocument doc1 = mock(PDDocument.class);
+        when(pdfDocumentFactory.load(mockFile1)).thenReturn(doc1);
+        when(doc1.getNumberOfPages()).thenReturn(3);
+
+        // When
+        Method addTableOfContentsMethod = MergeController.class.getDeclaredMethod("addTableOfContents", PDDocument.class, MultipartFile[].class);
+        addTableOfContentsMethod.setAccessible(true);
+        
+        // Should not throw exception
+        assertDoesNotThrow(() -> 
+            addTableOfContentsMethod.invoke(mergeController, mockMergedDocument, files)
+        );
+
+        // Then
+        verify(mockCatalog).setDocumentOutline(any(PDDocumentOutline.class));
+        verify(mockMergedDocument, never()).getPage(anyInt());
+        verify(doc1).close();
+    }
+
+    @Test
+    void testMergeDocuments_Success() throws IOException {
+        // Given
+        PDDocument doc1 = mock(PDDocument.class);
+        PDDocument doc2 = mock(PDDocument.class);
+        List<PDDocument> documents = Arrays.asList(doc1, doc2);
+        
+        PDPageTree pages1 = mock(PDPageTree.class);
+        PDPageTree pages2 = mock(PDPageTree.class);
+        PDPage page1 = mock(PDPage.class);
+        PDPage page2 = mock(PDPage.class);
+        
+        when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument);
+        when(doc1.getPages()).thenReturn(pages1);
+        when(doc2.getPages()).thenReturn(pages2);
+        when(pages1.iterator()).thenReturn(Arrays.asList(page1).iterator());
+        when(pages2.iterator()).thenReturn(Arrays.asList(page2).iterator());
+
+        // When
+        PDDocument result = mergeController.mergeDocuments(documents);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(mockMergedDocument, result);
+        verify(mockMergedDocument).addPage(page1);
+        verify(mockMergedDocument).addPage(page2);
+    }
+
+    @Test
+    void testMergeDocuments_EmptyList_ReturnsEmptyDocument() throws IOException {
+        // Given
+        List<PDDocument> documents = Arrays.asList();
+        
+        when(pdfDocumentFactory.createNewDocument()).thenReturn(mockMergedDocument);
+
+        // When
+        PDDocument result = mergeController.mergeDocuments(documents);
+
+        // Then
+        assertNotNull(result);
+        assertEquals(mockMergedDocument, result);
+        verify(mockMergedDocument, never()).addPage(any(PDPage.class));
+    }
+
+}