Update README.md

Update links and formatting in README.md
Update README.md
2026-09-03 05:10:16 +03:00 · 2025-12-02 18:54:10 +00:00 · 2025-12-02 17:05:07 +00:00 · 2025-12-02 16:38:43 +00:00 · 2025-12-02 16:38:16 +00:00 · 2025-12-02 16:30:30 +00:00
125 changed files with 3120 additions and 1109 deletions
@@ -6,6 +6,10 @@ Portions of this software are licensed as follows:

 * All content that resides under the "app/proprietary/" directory of this repository,
 if that directory exists, is licensed under the license defined in "app/proprietary/LICENSE".
+* All content that resides under the "frontend/src/proprietary/" directory of this repository,
+if that directory exists, is licensed under the license defined in "frontend/src/proprietary/LICENSE".
+* All content that resides under the "frontend/src/desktop/" directory of this repository,
+if that directory exists, is licensed under the license defined in "frontend/src/desktop/LICENSE".
 * Content outside of the above mentioned directories or restrictions above is
 available under the MIT License as defined below.

@@ -1,173 +1,69 @@
-<p align="center"><img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80"></p>
-<h1 align="center">Stirling-PDF</h1>
+<p align="center">
+  <img src="https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling.png" width="80" alt="Stirling PDF logo">
+</p>

-[![Docker Pulls](https://img.shields.io/docker/pulls/frooodle/s-pdf)](https://hub.docker.com/r/frooodle/s-pdf)
-[![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/HYmhKj45pU)
-[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/Stirling-Tools/Stirling-PDF/badge)](https://scorecard.dev/viewer/?uri=github.com/Stirling-Tools/Stirling-PDF)
-[![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
+<h1 align="center">Stirling PDF - The Open-Source PDF Platform</h1>

-<a href="https://www.producthunt.com/posts/stirling-pdf?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-stirling&#0045;pdf" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=641239&theme=light" alt="Stirling&#0032;PDF - Open&#0032;source&#0032;locally&#0032;hosted&#0032;web&#0032;PDF&#0032;editor | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-[![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
+Stirling PDF is a powerful, open-source PDF editing platform. Run it as a personal desktop app, in the browser, or deploy it on your own servers with a private API. Edit, sign, redact, convert, and automate PDFs without sending documents to external services.

-[Stirling-PDF](https://www.stirlingpdf.com) is a robust, locally hosted web-based PDF manipulation tool using Docker. It enables you to carry out various operations on PDF files, including splitting, merging, converting, reorganizing, adding images, rotating, compressing, and more. This locally hosted web application has evolved to encompass a comprehensive set of features, addressing all your PDF requirements.
+<p align="center">
+  <a href="https://hub.docker.com/r/stirlingtools/stirling-pdf">
+    <img src="https://img.shields.io/docker/pulls/frooodle/s-pdf" alt="Docker Pulls">
+  </a>
+  <a href="https://discord.gg/HYmhKj45pU">
+    <img src="https://img.shields.io/discord/1068636748814483718?label=Discord" alt="Discord">
+  </a>
+  <a href="https://scorecard.dev/viewer/?uri=github.com/Stirling-Tools/Stirling-PDF">
+    <img src="https://api.scorecard.dev/projects/github.com/Stirling-Tools/Stirling-PDF/badge" alt="OpenSSF Scorecard">
+  </a>
+  <a href="https://github.com/Stirling-Tools/stirling-pdf">
+    <img src="https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social" alt="GitHub Repo stars">
+  </a>
+</p>

-All files and PDFs exist either exclusively on the client side, reside in server memory only during task execution, or temporarily reside in a file solely for the execution of the task. Any file downloaded by the user will have been deleted from the server by that point.
+![Stirling PDF - Dashboard](images/home-light.png)

-Homepage: [https://stirlingpdf.com](https://stirlingpdf.com)
+## Key Capabilities

-All documentation available at [https://docs.stirlingpdf.com/](https://docs.stirlingpdf.com/)
+- **Everywhere you work** - Desktop client, browser UI, and self-hosted server with a private API.
+- **50+ PDF tools** - Edit, merge, split, sign, redact, convert, OCR, compress, and more.
+- **Automation & workflows** - No-code pipelines direct in UI with APIs to process millions of PDFs.
+- **Enterprise‑grade** - SSO, auditing, and flexible on‑prem deployments.
+- **Developer platform** - REST APIs available for nearly all tools to integrate into your existing systems.
+- **Global UI** - Interface available in 40+ languages.

-![stirling-home](images/stirling-home.jpg)
+For a full feature list, see the docs: **https://docs.stirlingpdf.com**

-## Features
+## Quick Start

- 50+ PDF Operations
- Parallel file processing and downloads
- Dark mode support
- Custom download options
- Custom 'Pipelines' to run multiple features in a automated queue
- API for integration with external scripts
- Optional Login and Authentication support (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/System%20and%20Security) for documentation)
- Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)
- Enterprise features like SSO (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/Single%20Sign-On%20Configuration) for documentation)
+```bash
+docker run -p 8080:8080 docker.stirlingpdf.com/stirlingtools/stirling-pdf
+```

-## PDF Features
+Then open: http://localhost:8080

-### Page Operations
+For full installation options (including desktop and Kubernetes), see our [Documentation Guide](https://docs.stirlingpdf.com/#documentation-guide).

- View and modify PDFs - View multi-page PDFs with custom viewing, sorting, and searching. Plus, on-page edit features like annotating, drawing, and adding text and images. (Using PDF.js with Joxit and Liberation fonts)
- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages
- Merge multiple PDFs into a single resultant file
- Split PDFs into multiple files at specified page numbers or extract all pages as individual files
- Reorganize PDF pages into different orders
- Rotate PDFs in 90-degree increments
- Remove pages
- Multi-page layout (format PDFs into a multi-paged page)
- Scale page contents size by set percentage
- Adjust contrast
- Crop PDF
- Auto-split PDF (with physically scanned page dividers)
- Extract page(s)
- Convert PDF to a single page
- Overlay PDFs on top of each other
- PDF to a single page
- Split PDF by sections
+## Resources

-### Conversion Operations
+- [**Documentation**](https://docs.stirlingpdf.com)
+- [**Homepage**](https://stirling.com)
+- [**API Docs**](https://registry.scalar.com/@stirlingpdf/apis/stirling-pdf-processing-api/)
+- [**Server Plan & Enterprise**](https://docs.stirlingpdf.com/Paid-Offerings)

- Convert PDFs to and from images
- Convert any common file to PDF (using LibreOffice)
- Convert PDF to Word/PowerPoint/others (using LibreOffice)
- Convert HTML to PDF
- Convert PDF to XML
- Convert PDF to CSV
- URL to PDF
- Markdown to PDF
+## Support

-### Security & Permissions
+- **Community** [Discord](https://discord.gg/HYmhKj45pU)
+- **Bug Reports**: [Github issues](https://github.com/Stirling-Tools/Stirling-PDF/issues)

- Add and remove passwords
- Change/set PDF permissions
- Add watermark(s)
- Certify/sign PDFs
- Sanitize PDFs
- Auto-redact text
+## Contributing

-### Other Operations
+We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.

- Add/generate/write signatures
- Split by Size or PDF
- Repair PDFs
- Detect and remove blank pages
- Compare two PDFs and show differences in text
- Add images to PDFs
- Compress PDFs to decrease their filesize (using qpdf)
- Extract images from PDF
- Remove images from PDF
- Extract images from scans
- Remove annotations
- Add page numbers
- Auto-rename files by detecting PDF header text
- OCR on PDF (using Tesseract OCR)
- PDF/A conversion (using LibreOffice)
- Edit metadata
- Flatten PDFs
- Get all information on a PDF to view or export as JSON
- Show/detect embedded JavaScript
+For development setup, see the [Developer Guide](DeveloperGuide.md).

+For adding translations, see the [Translation Guide](devGuide/HowToAddNewLanguage.md).

+## License

-# 📖 Get Started
-
-Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.stirlingpdf.com) for:
-
- Installation guides for all platforms
- Configuration options
- Feature documentation
- API reference
- Security setup
- Enterprise features
-
-
-## Supported Languages
-
-Stirling-PDF currently supports 40 languages!
-
-| Language                                     | Progress                               |
-| -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![87%](https://geps.dev/progress/87)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![86%](https://geps.dev/progress/86)   |
-| Basque (Euskara) (eu_ES)                     | ![86%](https://geps.dev/progress/86)   |
-| Bulgarian (Български) (bg_BG)                | ![86%](https://geps.dev/progress/86)   |
-| Catalan (Català) (ca_CA)                     | ![85%](https://geps.dev/progress/85)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![86%](https://geps.dev/progress/86)   |
-| Czech (Česky) (cs_CZ)                        | ![84%](https://geps.dev/progress/84)   |
-| Danish (Dansk) (da_DK)                       | ![85%](https://geps.dev/progress/85)   |
-| Dutch (Nederlands) (nl_NL)                   | ![85%](https://geps.dev/progress/85)   |
-| English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
-| English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![85%](https://geps.dev/progress/85)   |
-| German (Deutsch) (de_DE)                     | ![86%](https://geps.dev/progress/86)   |
-| Greek (Ελληνικά) (el_GR)                     | ![86%](https://geps.dev/progress/86)   |
-| Hindi (हिंदी) (hi_IN)                          | ![86%](https://geps.dev/progress/86)   |
-| Hungarian (Magyar) (hu_HU)                   | ![86%](https://geps.dev/progress/86)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![85%](https://geps.dev/progress/85)   |
-| Irish (Gaeilge) (ga_IE)                      | ![86%](https://geps.dev/progress/86)   |
-| Italian (Italiano) (it_IT)                   | ![85%](https://geps.dev/progress/85)   |
-| Japanese (日本語) (ja_JP)                    | ![86%](https://geps.dev/progress/86)   |
-| Korean (한국어) (ko_KR)                      | ![86%](https://geps.dev/progress/86)   |
-| Norwegian (Norsk) (no_NB)                    | ![86%](https://geps.dev/progress/86)   |
-| Persian (فارسی) (fa_IR)                      | ![86%](https://geps.dev/progress/86)   |
-| Polish (Polski) (pl_PL)                      | ![86%](https://geps.dev/progress/86)   |
-| Portuguese (Português) (pt_PT)               | ![86%](https://geps.dev/progress/86)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![86%](https://geps.dev/progress/86)   |
-| Romanian (Română) (ro_RO)                    | ![85%](https://geps.dev/progress/85)   |
-| Russian (Русский) (ru_RU)                    | ![86%](https://geps.dev/progress/86)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![86%](https://geps.dev/progress/86)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![87%](https://geps.dev/progress/87)   |
-| Slovakian (Slovensky) (sk_SK)                | ![86%](https://geps.dev/progress/86)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![86%](https://geps.dev/progress/86)   |
-| Spanish (Español) (es_ES)                    | ![86%](https://geps.dev/progress/86)   |
-| Swedish (Svenska) (sv_SE)                    | ![86%](https://geps.dev/progress/86)   |
-| Thai (ไทย) (th_TH)                           | ![86%](https://geps.dev/progress/86)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![87%](https://geps.dev/progress/87)   |
-| Turkish (Türkçe) (tr_TR)                     | ![86%](https://geps.dev/progress/86)   |
-| Ukrainian (Українська) (uk_UA)               | ![86%](https://geps.dev/progress/86)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![86%](https://geps.dev/progress/86)   |
-| Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
-
-## Stirling PDF Enterprise
-
-Stirling PDF offers an Enterprise edition of its software. This is the same great software but with added features, support and comforts.
-Check out our [Enterprise docs](https://docs.stirlingpdf.com/Pro)
-
-
-## 🤝 Looking to contribute?
-
-Join our community:
- [Contribution Guidelines](CONTRIBUTING.md)
- [Translation Guide (How to add custom languages)](devGuide/HowToAddNewLanguage.md)
- [Developer Guide](devGuide/DeveloperGuide.md)
- [Issue Tracker](https://github.com/Stirling-Tools/Stirling-PDF/issues)
- [Discord Community](https://discord.gg/HYmhKj45pU)
+Stirling PDF is open-core. See [LICENSE](LICENSE) for details.
@@ -22,25 +22,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Analysis",
        description =
                """
-                Document analysis and information extraction services for content intelligence and insights.
+                Read-only inspection of PDFs: page count, page sizes, fonts, form fields, annotations, document properties, and security details.
+                Use these endpoints to understand what's inside a document without changing it.

-                This endpoint group provides analytical capabilities to understand document structure,
-                extract information, and generate insights from PDF content for automated processing.
-
-                Common use cases:
-                • Document inventory management and content audit for compliance verification
-                • Quality assurance workflows and business intelligence analytics
-                • Migration planning, accessibility evaluation, and document forensics
-
-                Business applications:
-                • Legal discovery, financial document review, and healthcare records analysis
-                • Academic research, government processing, and publishing optimization
-
-                Operational scenarios:
-                • Large-scale profiling, migration assessment, and performance optimization
-                • Automated quality control and content strategy development
-
-                Target users: Data analysts, QA teams, administrators, and business intelligence
-                professionals requiring detailed document insights.
+                Typical uses:
+                • Get page counts and dimensions for layout or print rules
+                • List fonts and annotations to spot compatibility issues
+                • Inspect form fields before deciding how to fill or modify them
+                • Pull metadata and security settings for audits or reports
                """)
 public @interface AnalysisApi {}
@@ -22,25 +22,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Convert",
        description =
                """
-                Document format transformation services for cross-platform compatibility and workflow integration.
+                Convert PDFs to and from other formats (Word, images, HTML, Markdown, PDF/A, CBZ/CBR, EML, etc.).
+                This group also powers the text-editor / jobId-based editing flow for incremental PDF edits.

-                This endpoint group enables transformation between various formats, supporting
-                diverse business workflows and system integrations for mixed document ecosystems.
-
-                Common use cases:
-                • Legacy system integration, document migration, and cross-platform sharing
-                • Archive standardization, publishing preparation, and content adaptation
-                • Accessibility compliance and mobile-friendly document preparation
-
-                Business applications:
-                • Enterprise content management, digital publishing, and educational platforms
-                • Legal document processing, healthcare interoperability, and government standardization
-
-                Integration scenarios:
-                • API-driven pipelines, automated workflow preparation, and batch conversions
-                • Real-time format adaptation for user requests
-
-                Target users: System integrators, content managers, digital archivists, and
-                organizations requiring flexible document format interoperability.
+                Typical uses:
+                • Turn PDFs into Word or text for editing
+                • Convert office files, images, HTML, or email (EML) into PDFs
+                • Create PDF/A for long-term archiving
+                • Export PDFs as images, HTML, CSV, or Markdown for search, analysis, or reuse
                """)
 public @interface ConvertApi {}
@@ -22,25 +22,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Filter",
        description =
                """
-                Document content filtering and search operations for information discovery and organization.
+                Check basic properties of PDFs before you process them: page count, file size, page size/rotation, and whether they contain text or images.
+                Use these endpoints as a "pre-check" step to decide what to do with a file next.

-                This endpoint group enables intelligent content discovery and organization within
-                document collections for content-based processing and information extraction.
-
-                Common use cases:
-                • Legal discovery, research organization, and compliance auditing
-                • Content moderation, academic research, and business intelligence
-                • Quality assurance and content validation workflows
-
-                Business applications:
-                • Contract analysis, financial review, and healthcare records organization
-                • Government processing, educational curation, and IP protection
-
-                Workflow scenarios:
-                • Large-scale processing, automated classification, and information extraction
-                • Document preparation for further processing or analysis
-
-                Target users: Legal professionals, researchers, compliance officers, and
-                organizations requiring intelligent document content discovery and organization.
+                Typical uses:
+                • Reject files that are too big or too small
+                • Detect image-only PDFs that should go through OCR
+                • Ensure a document has enough pages before it enters a workflow
+                • Check orientation of pages before printing or merging
                """)
 public @interface FilterApi {}
@@ -22,21 +22,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "General",
        description =
                """
-                Core PDF processing operations for fundamental document manipulation workflows.
+                Page-level PDF editing: split, merge, rotate, crop, rearrange, and scale pages.
+                These endpoints handle most daily "I opened a PDF editor just to…" type tasks.

-                This endpoint group provides essential PDF functionality that forms the foundation
-                of most document processing workflows across various industries.
-
-                Common use cases:
-                • Document preparation for archival systems and content organization
-                • File preparation for distribution, accessibility compliance, and batch processing
-                • Document consolidation for reporting and legal compliance workflows
-
-                Typical applications:
-                • Content management, publishing workflows, and educational content distribution
-                • Business process automation and archive management
-
-                Target users: Content managers, document processors, and organizations requiring
-                reliable foundational PDF manipulation capabilities.
+                Typical uses:
+                • Split a large PDF into smaller files (by pages, chapters, or size)
+                • Merge several PDFs into one report or pack
+                • Rotate or reorder pages before sending or archiving
+                • Turn a multi-page document into one long scrolling page
                """)
 public @interface GeneralApi {}
@@ -22,25 +22,15 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Misc",
        description =
                """
-                Specialized utilities and supplementary tools for enhanced document processing workflows.
+                Tools that don't fit neatly elsewhere: OCR, compress, repair, flatten, extract images, update metadata, add stamps/page numbers/images, and more.
+                These endpoints help fix problem PDFs and prepare them for sharing, storage, or further processing.

-                This endpoint group provides utility operations that support core document processing
-                tasks and address specific workflow needs in real-world scenarios.
-
-                Common use cases:
-                • Document optimization for bandwidth-limited environments and storage cost management
-                • Document repair, content extraction, and validation for quality assurance
-                • Accessibility improvement and custom processing for specialized needs
-
-                Business applications:
-                • Web publishing optimization, email attachment management, and archive efficiency
-                • Mobile compatibility, print production, and legacy document recovery
-
-                Operational scenarios:
-                • Batch processing, quality control, and performance optimization
-                • Troubleshooting and recovery of problematic documents
-
-                Target users: System administrators, document specialists, and organizations requiring
-                specialized document processing and optimization tools.
+                Typical uses:
+                • Repair a damaged PDF or remove blank pages
+                • Run OCR on scanned PDFs so they become searchable
+                • Compress large PDFs for email or web download
+                • Extract embedded images or scans
+                • Add page numbers, stamps, or overlay an image (e.g. logo, seal)
+                • Update PDF metadata (title, author, etc.)
                """)
 public @interface MiscApi {}
@@ -22,25 +22,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Pipeline",
        description =
                """
-                Automated document processing workflows for complex multi-stage business operations.
+                Run several PDF operations in one configured pipeline instead of calling multiple endpoints yourself.
+                Useful when you always do the same steps in sequence (for example: convert → OCR → compress → watermark).

-                This endpoint group enables organizations to create sophisticated document processing
-                workflows that combine multiple operations into streamlined, repeatable processes.
-
-                Common use cases:
-                • Invoice processing, legal document review, and healthcare records standardization
-                • Government processing, educational content preparation, and publishing automation
-                • Contract lifecycle management and approval processes
-
-                Business applications:
-                • Automated compliance reporting, large-scale migration, and quality assurance
-                • Archive preparation, content delivery, and document approval workflows
-
-                Operational scenarios:
-                • Scheduled batch processing and event-driven document processing
-                • Multi-department coordination and business system integration
-
-                Target users: Business process managers, IT automation specialists, and organizations
-                requiring consistent, repeatable document processing workflows.
+                Typical uses:
+                • Process incoming invoices in one go (clean, OCR, compress, stamp, etc.)
+                • Normalise documents before they enter an archive
+                • Wrap a complex document flow behind a single API call for your own apps
                """)
 public @interface PipelineApi {}
@@ -22,25 +22,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
        name = "Security",
        description =
                """
-                Document security and protection services for confidential and sensitive content.
+                Protect and clean PDFs: passwords, digital signatures, redaction, and sanitizing.
+                These endpoints help you control who can open a file, what they can do with it, and remove sensitive content when needed.

-                This endpoint group provides essential security operations for organizations handling
-                sensitive documents and materials requiring controlled access.
-
-                Common use cases:
-                • Legal confidentiality, healthcare privacy (HIPAA), and financial regulatory compliance
-                • Government classified handling, corporate IP protection, and educational privacy (FERPA)
-                • Contract security for business transactions
-
-                Business applications:
-                • Document authentication, confidential sharing, and secure archiving
-                • Content watermarking, access control, and privacy protection through redaction
-
-                Industry scenarios:
-                • Legal discovery, medical records exchange, financial audit documentation
-                • Enterprise policy enforcement and data governance
-
-                Target users: Legal professionals, healthcare administrators, compliance officers,
-                government agencies, and enterprises handling sensitive content.
+                Typical uses:
+                • Add or remove a password on a PDF
+                • Redact personal or confidential information (manually or automatically)
+                • Validate or remove digital signatures
+                • Sanitize a PDF to strip scripts and embedded content
                """)
 public @interface SecurityApi {}
@@ -0,0 +1,21 @@
+package stirling.software.common.service;
+
+import java.io.IOException;
+
+/**
+ * Interface for personal signature access (proprietary feature). Implemented only in proprietary
+ * module to provide authenticated users access to their personal signatures.
+ */
+public interface PersonalSignatureServiceInterface {
+
+    /**
+     * Get a personal signature from the user's folder. Only checks personal folder, not shared
+     * folder.
+     *
+     * @param username Username of the signature owner
+     * @param fileName Signature filename
+     * @return Personal signature image bytes
+     * @throws IOException If file not found or read error
+     */
+    byte[] getPersonalSignatureBytes(String username, String fileName) throws IOException;
+}
@@ -159,6 +159,8 @@ public class RequestUriUtils {
                || trimmedUri.startsWith(
                        "/api/v1/proprietary/ui-data/login") // Login page config (SSO providers +
                // enableLogin)
+                || trimmedUri.startsWith(
+                        "/api/v1/ui-data/footer-info") // Public footer configuration
                || trimmedUri.startsWith("/v1/api-docs")
                || trimmedUri.startsWith("/api/v1/invite/validate")
                || trimmedUri.startsWith("/api/v1/invite/accept")
@@ -51,7 +51,8 @@ public class RequestUriUtilsTest {

    @Test
    void testIsFrontendRoute() {
-        assertTrue(RequestUriUtils.isFrontendRoute("", "/"), "Root path should be a frontend route");
+        assertTrue(
+                RequestUriUtils.isFrontendRoute("", "/"), "Root path should be a frontend route");
        assertTrue(
                RequestUriUtils.isFrontendRoute("", "/app/dashboard"),
                "React routes without extensions should be frontend routes");
@@ -21,6 +21,9 @@ public class SpringDocConfig {
                        "/api/v1/user/**",
                        "/api/v1/settings/**",
                        "/api/v1/team/**",
+                        "/api/v1/auth/**",
+                        "/api/v1/invite/**",
+                        "/api/v1/audit/**",
                        "/api/v1/ui-data/**",
                        "/api/v1/proprietary/ui-data/**",
                        "/api/v1/info/**",
@@ -33,7 +36,7 @@ public class SpringDocConfig {
                                    openApi.getInfo()
                                            .title("Stirling PDF - Processing API")
                                            .description(
-                                                    "API documentation for PDF processing operations including conversion, manipulation, security, and utilities."));
+                                                    "APIs for converting, editing, securing, and analysing PDF documents. Use these endpoints to automate common PDF tasks (like split, merge, convert, OCR) and plug them into your own apps and backend jobs."));
                        })
                .build();
    }
@@ -47,14 +50,17 @@ public class SpringDocConfig {
                        "/api/v1/admin/**",
                        "/api/v1/user/**",
                        "/api/v1/settings/**",
-                        "/api/v1/team/**")
+                        "/api/v1/team/**",
+                        "/api/v1/auth/**",
+                        "/api/v1/invite/**",
+                        "/api/v1/audit/**")
                .addOpenApiCustomizer(
                        openApi -> {
                            openApi.info(
                                    openApi.getInfo()
-                                            .title("Stirling PDF - Admin API")
+                                            .title("Stirling PDF - Management API")
                                            .description(
-                                                    "API documentation for administrative functions, user management, and system configuration."));
+                                                    "Endpoints for authentication, user management, invitations, audit logging, and system configuration."));
                        })
                .build();
    }
@@ -76,7 +82,7 @@ public class SpringDocConfig {
                                    openApi.getInfo()
                                            .title("Stirling PDF - System API")
                                            .description(
-                                                    "API documentation for system information, UI data, and utility endpoints."));
+                                                    "System information, UI metadata, job status, and file management endpoints."));
                        })
                .build();
    }
@@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.model.Dependency;
 import stirling.software.SPDF.model.SignatureFile;
-import stirling.software.SPDF.service.SignatureService;
+import stirling.software.SPDF.service.SharedSignatureService;
 import stirling.software.common.annotations.api.UiDataApi;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.configuration.RuntimePathConfig;
@@ -40,14 +40,14 @@ import stirling.software.common.util.GeneralUtils;
 public class UIDataController {

    private final ApplicationProperties applicationProperties;
-    private final SignatureService signatureService;
+    private final SharedSignatureService signatureService;
    private final UserServiceInterface userService;
    private final ResourceLoader resourceLoader;
    private final RuntimePathConfig runtimePathConfig;

    public UIDataController(
            ApplicationProperties applicationProperties,
-            SignatureService signatureService,
+            SharedSignatureService signatureService,
            @Autowired(required = false) UserServiceInterface userService,
            ResourceLoader resourceLoader,
            RuntimePathConfig runtimePathConfig) {
@@ -58,6 +58,21 @@ public class UIDataController {
        this.runtimePathConfig = runtimePathConfig;
    }

+    @GetMapping("/footer-info")
+    @Operation(summary = "Get public footer configuration data")
+    public ResponseEntity<FooterData> getFooterData() {
+        FooterData data = new FooterData();
+        data.setAnalyticsEnabled(applicationProperties.getSystem().getEnableAnalytics());
+        data.setTermsAndConditions(applicationProperties.getLegal().getTermsAndConditions());
+        data.setPrivacyPolicy(applicationProperties.getLegal().getPrivacyPolicy());
+        data.setAccessibilityStatement(
+                applicationProperties.getLegal().getAccessibilityStatement());
+        data.setCookiePolicy(applicationProperties.getLegal().getCookiePolicy());
+        data.setImpressum(applicationProperties.getLegal().getImpressum());
+
+        return ResponseEntity.ok(data);
+    }
+
    @GetMapping("/home")
    @Operation(summary = "Get home page data")
    public ResponseEntity<HomeData> getHomeData() {
@@ -237,6 +252,16 @@ public class UIDataController {
    }

    // Data classes
+    @Data
+    public static class FooterData {
+        private Boolean analyticsEnabled;
+        private String termsAndConditions;
+        private String privacyPolicy;
+        private String accessibilityStatement;
+        private String cookiePolicy;
+        private String impressum;
+    }
+
    @Data
    public static class HomeData {
        private boolean showSurveyFromDocker;
@@ -25,7 +25,7 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.model.SignatureFile;
-import stirling.software.SPDF.service.SignatureService;
+import stirling.software.SPDF.service.SharedSignatureService;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.service.UserServiceInterface;
@@ -37,13 +37,13 @@ import stirling.software.common.util.GeneralUtils;
@Slf4j
 public class GeneralWebController {

-    private final SignatureService signatureService;
+    private final SharedSignatureService signatureService;
    private final UserServiceInterface userService;
    private final ResourceLoader resourceLoader;
    private final RuntimePathConfig runtimePathConfig;

    public GeneralWebController(
-            SignatureService signatureService,
+            SharedSignatureService signatureService,
            @Autowired(required = false) UserServiceInterface userService,
            ResourceLoader resourceLoader,
            RuntimePathConfig runtimePathConfig) {
@@ -6,12 +6,14 @@ import org.springframework.web.bind.annotation.GetMapping;
@Controller
 public class ReactRoutingController {

-    @GetMapping("/{path:^(?!api|static|robots\\.txt|favicon\\.ico|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js)[^\\.]*$}")
+    @GetMapping(
+            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js)[^\\.]*$}")
    public String forwardRootPaths() {
        return "forward:/index.html";
    }

-    @GetMapping("/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
+    @GetMapping(
+            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
    public String forwardNestedPaths() {
        return "forward:/index.html";
    }
@@ -1,48 +0,0 @@
-package stirling.software.SPDF.controller.web;
-
-import java.io.IOException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import stirling.software.SPDF.service.SignatureService;
-import stirling.software.common.service.UserServiceInterface;
-
-// @Controller // Disabled - Backend-only mode, no Thymeleaf UI
-@RequestMapping("/api/v1/general")
-public class SignatureController {
-
-    private final SignatureService signatureService;
-
-    private final UserServiceInterface userService;
-
-    public SignatureController(
-            SignatureService signatureService,
-            @Autowired(required = false) UserServiceInterface userService) {
-        this.signatureService = signatureService;
-        this.userService = userService;
-    }
-
-    @GetMapping("/sign/{fileName}")
-    public ResponseEntity<byte[]> getSignature(@PathVariable(name = "fileName") String fileName)
-            throws IOException {
-        String username = "NON_SECURITY_USER";
-        if (userService != null) {
-            username = userService.getCurrentUsername();
-        }
-        // Verify access permission
-        if (!signatureService.hasAccessToFile(username, fileName)) {
-            return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
-        }
-        byte[] imageBytes = signatureService.getSignatureBytes(username, fileName);
-        return ResponseEntity.ok()
-                .contentType( // Adjust based on file type
-                        MediaType.IMAGE_JPEG)
-                .body(imageBytes);
-    }
-}
@@ -0,0 +1,84 @@
+package stirling.software.SPDF.controller.web;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.service.SharedSignatureService;
+import stirling.software.common.service.PersonalSignatureServiceInterface;
+import stirling.software.common.service.UserServiceInterface;
+
+/**
+ * Unified signature image controller that works for both authenticated and unauthenticated users.
+ * Uses composition pattern: - Core SharedSignatureService (always available): reads shared signatures -
+ * PersonalSignatureService (proprietary, optional): reads personal signatures For authenticated
+ * signature management (save/delete), see proprietary SignatureController.
+ */
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/general")
+public class SignatureImageController {
+
+    private final SharedSignatureService sharedSignatureService;
+    private final PersonalSignatureServiceInterface personalSignatureService;
+    private final UserServiceInterface userService;
+
+    public SignatureImageController(
+            SharedSignatureService sharedSignatureService,
+            @Autowired(required = false) PersonalSignatureServiceInterface personalSignatureService,
+            @Autowired(required = false) UserServiceInterface userService) {
+        this.sharedSignatureService = sharedSignatureService;
+        this.personalSignatureService = personalSignatureService;
+        this.userService = userService;
+    }
+
+    /**
+     * Get a signature image (works for both authenticated and unauthenticated users). -
+     * Authenticated with proprietary: tries personal first, then shared - Unauthenticated or
+     * community: tries shared only
+     */
+    @GetMapping("/signatures/{fileName}")
+    public ResponseEntity<byte[]> getSignature(@PathVariable(name = "fileName") String fileName) {
+        try {
+            byte[] imageBytes = null;
+
+            // If proprietary service available and user authenticated, try personal folder first
+            if (personalSignatureService != null && userService != null) {
+                try {
+                    String username = userService.getCurrentUsername();
+                    imageBytes =
+                            personalSignatureService.getPersonalSignatureBytes(username, fileName);
+                } catch (Exception e) {
+                    // Not found in personal folder or not authenticated, will try shared
+                    log.debug("Personal signature not found, trying shared: {}", e.getMessage());
+                }
+            }
+
+            // If not found in personal (or no personal service), try shared
+            if (imageBytes == null) {
+                imageBytes = sharedSignatureService.getSharedSignatureBytes(fileName);
+            }
+
+            // Determine content type from file extension
+            MediaType contentType = MediaType.IMAGE_PNG; // Default
+            String lowerFileName = fileName.toLowerCase();
+            if (lowerFileName.endsWith(".jpg") || lowerFileName.endsWith(".jpeg")) {
+                contentType = MediaType.IMAGE_JPEG;
+            }
+
+            return ResponseEntity.ok().contentType(contentType).body(imageBytes);
+        } catch (IOException e) {
+            log.debug("Signature not found: {}", fileName);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        }
+    }
+}
@@ -0,0 +1,18 @@
+package stirling.software.SPDF.model.api.signature;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SavedSignatureRequest {
+    private String id;
+    private String label;
+    private String type; // "canvas", "image", "text"
+    private String scope; // "personal", "shared"
+    private String dataUrl; // For canvas and image types
+    private String signerName; // For text type
+    private String fontFamily; // For text type
+    private Integer fontSize; // For text type
+    private String textColor; // For text type
+}
@@ -0,0 +1,22 @@
+package stirling.software.SPDF.model.api.signature;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SavedSignatureResponse {
+    private String id;
+    private String label;
+    private String type; // "canvas", "image", "text"
+    private String scope; // "personal", "shared"
+    private String dataUrl; // For canvas and image types (or URL to fetch image)
+    private String signerName; // For text type
+    private String fontFamily; // For text type
+    private Integer fontSize; // For text type
+    private String textColor; // For text type
+    private Long createdAt;
+    private Long updatedAt;
+}
@@ -0,0 +1,308 @@
+package stirling.software.SPDF.service;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.model.SignatureFile;
+import stirling.software.SPDF.model.api.signature.SavedSignatureRequest;
+import stirling.software.SPDF.model.api.signature.SavedSignatureResponse;
+import stirling.software.common.configuration.InstallationPathConfig;
+
+@Service
+@Slf4j
+public class SharedSignatureService {
+
+    private final String SIGNATURE_BASE_PATH;
+    private final String ALL_USERS_FOLDER = "ALL_USERS";
+    private final ObjectMapper objectMapper;
+
+    public SharedSignatureService() {
+        SIGNATURE_BASE_PATH = InstallationPathConfig.getSignaturesPath();
+        this.objectMapper = new ObjectMapper();
+    }
+
+    public boolean hasAccessToFile(String username, String fileName) throws IOException {
+        validateFileName(fileName);
+        // Check if file exists in user's personal folder or ALL_USERS folder
+        Path userPath = Paths.get(SIGNATURE_BASE_PATH, username, fileName);
+        Path allUsersPath = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER, fileName);
+
+        return Files.exists(userPath) || Files.exists(allUsersPath);
+    }
+
+    public List<SignatureFile> getAvailableSignatures(String username) {
+        List<SignatureFile> signatures = new ArrayList<>();
+
+        // Get signatures from user's personal folder
+        if (StringUtils.hasText(username)) {
+            Path userFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+            if (Files.exists(userFolder)) {
+                try {
+                    signatures.addAll(getSignaturesFromFolder(userFolder, "Personal"));
+                } catch (IOException e) {
+                    log.error("Error reading user signatures folder", e);
+                }
+            }
+        }
+
+        // Get signatures from ALL_USERS folder
+        Path allUsersFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
+        if (Files.exists(allUsersFolder)) {
+            try {
+                signatures.addAll(getSignaturesFromFolder(allUsersFolder, "Shared"));
+            } catch (IOException e) {
+                log.error("Error reading shared signatures folder", e);
+            }
+        }
+
+        return signatures;
+    }
+
+    private List<SignatureFile> getSignaturesFromFolder(Path folder, String category)
+            throws IOException {
+        try (Stream<Path> stream = Files.list(folder)) {
+            return stream.filter(this::isImageFile)
+                    .map(path -> new SignatureFile(path.getFileName().toString(), category))
+                    .toList();
+        }
+    }
+
+    /**
+     * Get a signature from the shared (ALL_USERS) folder. This is always available for both
+     * authenticated and unauthenticated users.
+     */
+    public byte[] getSharedSignatureBytes(String fileName) throws IOException {
+        validateFileName(fileName);
+        Path allUsersPath = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER, fileName);
+        if (!Files.exists(allUsersPath)) {
+            throw new FileNotFoundException("Shared signature file not found");
+        }
+        return Files.readAllBytes(allUsersPath);
+    }
+
+    private boolean isImageFile(Path path) {
+        String fileName = path.getFileName().toString().toLowerCase();
+        return fileName.endsWith(".jpg") || fileName.endsWith(".jpeg") || fileName.endsWith(".png");
+    }
+
+    private void validateFileName(String fileName) {
+        if (fileName.contains("..") || fileName.contains("/") || fileName.contains("\\")) {
+            throw new IllegalArgumentException("Invalid filename");
+        }
+        // Only allow alphanumeric, hyphen, underscore, and dot (for extensions)
+        if (!fileName.matches("^[a-zA-Z0-9_.-]+$")) {
+            throw new IllegalArgumentException("Filename contains invalid characters");
+        }
+    }
+
+    private String validateAndNormalizeExtension(String extension) {
+        String normalized = extension.toLowerCase().trim();
+        // Whitelist only safe image extensions
+        if (normalized.equals("png") || normalized.equals("jpg") || normalized.equals("jpeg")) {
+            return normalized;
+        }
+        throw new IllegalArgumentException("Unsupported image extension: " + extension);
+    }
+
+    private void verifyPathWithinDirectory(Path resolvedPath, Path targetDirectory)
+            throws IOException {
+        Path canonicalTarget = targetDirectory.toAbsolutePath().normalize();
+        Path canonicalResolved = resolvedPath.toAbsolutePath().normalize();
+        if (!canonicalResolved.startsWith(canonicalTarget)) {
+            throw new IOException("Resolved path is outside the target directory");
+        }
+    }
+
+    /** Save a signature as image file */
+    public SavedSignatureResponse saveSignature(String username, SavedSignatureRequest request)
+            throws IOException {
+        validateFileName(request.getId());
+
+        // Determine folder based on scope
+        String scope = request.getScope();
+        if (scope == null || scope.isEmpty()) {
+            scope = "personal"; // Default to personal
+        }
+
+        String folderName = "shared".equals(scope) ? ALL_USERS_FOLDER : username;
+        Path targetFolder = Paths.get(SIGNATURE_BASE_PATH, folderName);
+        Files.createDirectories(targetFolder);
+
+        long timestamp = System.currentTimeMillis();
+
+        SavedSignatureResponse response = new SavedSignatureResponse();
+        response.setId(request.getId());
+        response.setLabel(request.getLabel());
+        response.setType(request.getType());
+        response.setScope(scope);
+        response.setCreatedAt(timestamp);
+        response.setUpdatedAt(timestamp);
+
+        // Extract and save image data
+        String dataUrl = request.getDataUrl();
+        if (dataUrl != null && dataUrl.startsWith("data:image/")) {
+            // Extract base64 data
+            String base64Data = dataUrl.substring(dataUrl.indexOf(",") + 1);
+            byte[] imageBytes = Base64.getDecoder().decode(base64Data);
+
+            // Determine and validate file extension from data URL
+            String mimeType = dataUrl.substring(dataUrl.indexOf(":") + 1, dataUrl.indexOf(";"));
+            String rawExtension = mimeType.substring(mimeType.indexOf("/") + 1);
+            String extension = validateAndNormalizeExtension(rawExtension);
+
+            // Save image file only
+            String imageFileName = request.getId() + "." + extension;
+            Path imagePath = targetFolder.resolve(imageFileName);
+
+            // Verify path is within target directory
+            verifyPathWithinDirectory(imagePath, targetFolder);
+
+            Files.write(
+                    imagePath,
+                    imageBytes,
+                    StandardOpenOption.CREATE,
+                    StandardOpenOption.TRUNCATE_EXISTING);
+
+            // Store reference to image file
+            response.setDataUrl("/api/v1/general/sign/" + imageFileName);
+        }
+
+        log.info("Saved signature {} for user {}", request.getId(), username);
+        return response;
+    }
+
+    /** Get all saved signatures for a user */
+    public List<SavedSignatureResponse> getSavedSignatures(String username) throws IOException {
+        List<SavedSignatureResponse> signatures = new ArrayList<>();
+
+        // Load personal signatures
+        Path personalFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+        if (Files.exists(personalFolder)) {
+            try (Stream<Path> stream = Files.list(personalFolder)) {
+                stream.filter(this::isImageFile)
+                        .forEach(
+                                path -> {
+                                    try {
+                                        String fileName = path.getFileName().toString();
+                                        String id =
+                                                fileName.substring(0, fileName.lastIndexOf('.'));
+
+                                        SavedSignatureResponse sig = new SavedSignatureResponse();
+                                        sig.setId(id);
+                                        sig.setLabel(id); // Use ID as label
+                                        sig.setType("image"); // Default type
+                                        sig.setScope("personal");
+                                        sig.setDataUrl("/api/v1/general/sign/" + fileName);
+                                        sig.setCreatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+                                        sig.setUpdatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+
+                                        signatures.add(sig);
+                                    } catch (IOException e) {
+                                        log.error("Error reading signature file: " + path, e);
+                                    }
+                                });
+            }
+        }
+
+        // Load shared signatures
+        Path sharedFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
+        if (Files.exists(sharedFolder)) {
+            try (Stream<Path> stream = Files.list(sharedFolder)) {
+                stream.filter(this::isImageFile)
+                        .forEach(
+                                path -> {
+                                    try {
+                                        String fileName = path.getFileName().toString();
+                                        String id =
+                                                fileName.substring(0, fileName.lastIndexOf('.'));
+
+                                        SavedSignatureResponse sig = new SavedSignatureResponse();
+                                        sig.setId(id);
+                                        sig.setLabel(id); // Use ID as label
+                                        sig.setType("image"); // Default type
+                                        sig.setScope("shared");
+                                        sig.setDataUrl("/api/v1/general/sign/" + fileName);
+                                        sig.setCreatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+                                        sig.setUpdatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+
+                                        signatures.add(sig);
+                                    } catch (IOException e) {
+                                        log.error("Error reading signature file: " + path, e);
+                                    }
+                                });
+            }
+        }
+
+        return signatures;
+    }
+
+    /** Delete a saved signature */
+    public void deleteSignature(String username, String signatureId) throws IOException {
+        validateFileName(signatureId);
+
+        // Try to find and delete image file in personal folder
+        Path personalFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+        boolean deleted = false;
+
+        if (Files.exists(personalFolder)) {
+            try (Stream<Path> stream = Files.list(personalFolder)) {
+                List<Path> matchingFiles =
+                        stream.filter(
+                                        path ->
+                                                path.getFileName()
+                                                        .toString()
+                                                        .startsWith(signatureId + "."))
+                                .toList();
+                for (Path file : matchingFiles) {
+                    Files.delete(file);
+                    deleted = true;
+                }
+            }
+        }
+
+        // Try shared folder if not found in personal
+        if (!deleted) {
+            Path sharedFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
+            if (Files.exists(sharedFolder)) {
+                try (Stream<Path> stream = Files.list(sharedFolder)) {
+                    List<Path> matchingFiles =
+                            stream.filter(
+                                            path ->
+                                                    path.getFileName()
+                                                            .toString()
+                                                            .startsWith(signatureId + "."))
+                                    .toList();
+                    for (Path file : matchingFiles) {
+                        Files.delete(file);
+                        deleted = true;
+                    }
+                }
+            }
+        }
+
+        if (!deleted) {
+            throw new FileNotFoundException("Signature not found");
+        }
+
+        log.info("Deleted signature {} for user {}", signatureId, username);
+    }
+}
@@ -1,107 +0,0 @@
-package stirling.software.SPDF.service;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.model.SignatureFile;
-import stirling.software.common.configuration.InstallationPathConfig;
-
-@Service
-@Slf4j
-public class SignatureService {
-
-    private final String SIGNATURE_BASE_PATH;
-    private final String ALL_USERS_FOLDER = "ALL_USERS";
-
-    public SignatureService() {
-        SIGNATURE_BASE_PATH = InstallationPathConfig.getSignaturesPath();
-    }
-
-    public boolean hasAccessToFile(String username, String fileName) throws IOException {
-        validateFileName(fileName);
-        // Check if file exists in user's personal folder or ALL_USERS folder
-        Path userPath = Paths.get(SIGNATURE_BASE_PATH, username, fileName);
-        Path allUsersPath = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER, fileName);
-
-        return Files.exists(userPath) || Files.exists(allUsersPath);
-    }
-
-    public List<SignatureFile> getAvailableSignatures(String username) {
-        List<SignatureFile> signatures = new ArrayList<>();
-
-        // Get signatures from user's personal folder
-        if (StringUtils.hasText(username)) {
-            Path userFolder = Paths.get(SIGNATURE_BASE_PATH, username);
-            if (Files.exists(userFolder)) {
-                try {
-                    signatures.addAll(getSignaturesFromFolder(userFolder, "Personal"));
-                } catch (IOException e) {
-                    log.error("Error reading user signatures folder", e);
-                }
-            }
-        }
-
-        // Get signatures from ALL_USERS folder
-        Path allUsersFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
-        if (Files.exists(allUsersFolder)) {
-            try {
-                signatures.addAll(getSignaturesFromFolder(allUsersFolder, "Shared"));
-            } catch (IOException e) {
-                log.error("Error reading shared signatures folder", e);
-            }
-        }
-
-        return signatures;
-    }
-
-    private List<SignatureFile> getSignaturesFromFolder(Path folder, String category)
-            throws IOException {
-        try (Stream<Path> stream = Files.list(folder)) {
-            return stream.filter(this::isImageFile)
-                    .map(path -> new SignatureFile(path.getFileName().toString(), category))
-                    .toList();
-        }
-    }
-
-    public byte[] getSignatureBytes(String username, String fileName) throws IOException {
-        validateFileName(fileName);
-        // First try user's personal folder
-        Path userPath = Paths.get(SIGNATURE_BASE_PATH, username, fileName);
-        if (Files.exists(userPath)) {
-            return Files.readAllBytes(userPath);
-        }
-
-        // Then try ALL_USERS folder
-        Path allUsersPath = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER, fileName);
-        if (Files.exists(allUsersPath)) {
-            return Files.readAllBytes(allUsersPath);
-        }
-
-        throw new FileNotFoundException("Signature file not found");
-    }
-
-    private boolean isImageFile(Path path) {
-        String fileName = path.getFileName().toString().toLowerCase();
-        return fileName.endsWith(".jpg")
-                || fileName.endsWith(".jpeg")
-                || fileName.endsWith(".png")
-                || fileName.endsWith(".gif");
-    }
-
-    private void validateFileName(String fileName) {
-        if (fileName.contains("..") || fileName.contains("/") || fileName.contains("\\")) {
-            throw new IllegalArgumentException("Invalid filename");
-        }
-    }
-}
@@ -24,8 +24,8 @@
    --cc-toggle-on-knob-bg: var(--cc-btn-primary-color);
    --cc-toggle-off-knob-bg: var(--cc-btn-primary-color);

-    --cc-toggle-enabled-icon-color: var(--cc-btn-primary-color);   
-    --cc-toggle-disabled-icon-color: var(--cc-btn-primary-color);  
+    --cc-toggle-enabled-icon-color: var(--cc-btn-primary-color);
+    --cc-toggle-disabled-icon-color: var(--cc-btn-primary-color);

    --cc-toggle-readonly-bg: var(--md-sys-color-surface);
    --cc-toggle-readonly-knob-bg: var(--md-sys-color-outline);
@@ -34,10 +34,10 @@
    --cc-section-category-border: var(--md-sys-color-outline);

    --cc-cookie-category-block-bg: var(--cc-btn-secondary-bg);
-    --cc-cookie-category-block-border: var(--cc-btn-secondary-bg); 
+    --cc-cookie-category-block-border: var(--cc-btn-secondary-bg);
    --cc-cookie-category-block-hover-bg: var(--cc-btn-secondary-bg);
    --cc-cookie-category-block-hover-border: var(--cc-btn-secondary-bg);
-    
+
    --cc-cookie-category-expanded-block-bg: var(--cc-btn-secondary-bg);
    --cc-cookie-category-expanded-block-hover-bg: var(--cc-toggle-readonly-bg);

@@ -47,7 +47,7 @@
 */
    --cc-footer-bg: var(--cc-bg);
    --cc-footer-color: var(--cc-primary-color);
-    --cc-footer-border-color: var(--cc-bg); 
+    --cc-footer-border-color: var(--cc-bg);
 }
 .cm__body{
    max-width: 90% !important;
@@ -81,4 +81,4 @@
 /* Lower z-index so cookie banner appears behind onboarding modals */
 #cc-main {
    z-index: 100 !important;
-}
+}
@@ -23,7 +23,7 @@ import stirling.software.common.configuration.InstallationPathConfig;
 class SignatureServiceTest {

    @TempDir Path tempDir;
-    private SignatureService signatureService;
+    private SharedSignatureService signatureService;
    private Path personalSignatureFolder;
    private Path sharedSignatureFolder;
    private final String ALL_USERS_FOLDER = "ALL_USERS";
@@ -53,7 +53,7 @@ class SignatureServiceTest {
                    .thenReturn(tempDir.toString());

            // Initialize the service with our temp directory
-            signatureService = new SignatureService();
+            signatureService = new SharedSignatureService();
        }
    }

@@ -165,7 +165,7 @@ class SignatureServiceTest {
    }

    @Test
-    void testGetSignatureBytes_PersonalFile() throws IOException {
+    void testGetSharedSignatureBytes_SharedFile() throws IOException {
        // Mock static method for each test
        try (MockedStatic<InstallationPathConfig> mockedConfig =
                mockStatic(InstallationPathConfig.class)) {
@@ -173,28 +173,8 @@ class SignatureServiceTest {
                    .when(InstallationPathConfig::getSignaturesPath)
                    .thenReturn(tempDir.toString());

-            // Test
-            byte[] bytes = signatureService.getSignatureBytes(TEST_USER, "personal.png");
-
-            // Verify
-            assertEquals(
-                    "personal signature content",
-                    new String(bytes),
-                    "Should return the correct content for personal file");
-        }
-    }
-
-    @Test
-    void testGetSignatureBytes_SharedFile() throws IOException {
-        // Mock static method for each test
-        try (MockedStatic<InstallationPathConfig> mockedConfig =
-                mockStatic(InstallationPathConfig.class)) {
-            mockedConfig
-                    .when(InstallationPathConfig::getSignaturesPath)
-                    .thenReturn(tempDir.toString());
-
-            // Test
-            byte[] bytes = signatureService.getSignatureBytes(TEST_USER, "shared.jpg");
+            // Test - core service only reads shared signatures
+            byte[] bytes = signatureService.getSharedSignatureBytes("shared.jpg");

            // Verify
            assertEquals(
@@ -205,7 +185,7 @@ class SignatureServiceTest {
    }

    @Test
-    void testGetSignatureBytes_FileNotFound() {
+    void testGetSharedSignatureBytes_FileNotFound() {
        // Mock static method for each test
        try (MockedStatic<InstallationPathConfig> mockedConfig =
                mockStatic(InstallationPathConfig.class)) {
@@ -216,13 +196,13 @@ class SignatureServiceTest {
            // Test and verify
            assertThrows(
                    FileNotFoundException.class,
-                    () -> signatureService.getSignatureBytes(TEST_USER, "nonexistent.png"),
+                    () -> signatureService.getSharedSignatureBytes("nonexistent.png"),
                    "Should throw exception for non-existent files");
        }
    }

    @Test
-    void testGetSignatureBytes_InvalidFileName() {
+    void testGetSharedSignatureBytes_InvalidFileName() {
        // Mock static method for each test
        try (MockedStatic<InstallationPathConfig> mockedConfig =
                mockStatic(InstallationPathConfig.class)) {
@@ -233,11 +213,28 @@ class SignatureServiceTest {
            // Test and verify
            assertThrows(
                    IllegalArgumentException.class,
-                    () -> signatureService.getSignatureBytes(TEST_USER, "../invalid.png"),
+                    () -> signatureService.getSharedSignatureBytes("../invalid.png"),
                    "Should throw exception for file names with directory traversal");
        }
    }

+    @Test
+    void testGetSharedSignatureBytes_CannotAccessPersonalFiles() {
+        // Mock static method for each test
+        try (MockedStatic<InstallationPathConfig> mockedConfig =
+                mockStatic(InstallationPathConfig.class)) {
+            mockedConfig
+                    .when(InstallationPathConfig::getSignaturesPath)
+                    .thenReturn(tempDir.toString());
+
+            // Test and verify - core service should NOT be able to read personal files
+            assertThrows(
+                    FileNotFoundException.class,
+                    () -> signatureService.getSharedSignatureBytes("personal.png"),
+                    "Core service should not have access to personal signatures");
+        }
+    }
+
    @Test
    void testGetAvailableSignatures_EmptyUsername() throws IOException {
        // Mock static method for each test
@@ -0,0 +1,102 @@
+package stirling.software.proprietary.controller.api;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.annotations.api.UserApi;
+import stirling.software.proprietary.model.api.signature.SavedSignatureRequest;
+import stirling.software.proprietary.model.api.signature.SavedSignatureResponse;
+import stirling.software.proprietary.security.service.UserService;
+import stirling.software.proprietary.service.SignatureService;
+
+/**
+ * Controller for managing user signatures in proprietary/authenticated mode only. Requires user
+ * authentication and enforces per-user storage limits. All endpoints require authentication
+ * via @PreAuthorize("isAuthenticated()").
+ */
+@UserApi
+@Slf4j
+@RestController
+@RequestMapping("/api/v1/proprietary/signatures")
+@RequiredArgsConstructor
+@PreAuthorize("isAuthenticated()")
+public class SignatureController {
+
+    private final SignatureService signatureService;
+    private final UserService userService;
+
+    /**
+     * Save a new signature for the authenticated user. Enforces storage limits and authentication
+     * requirements.
+     */
+    @PostMapping
+    public ResponseEntity<SavedSignatureResponse> saveSignature(
+            @RequestBody SavedSignatureRequest request) {
+        try {
+            String username = userService.getCurrentUsername();
+
+            // Validate request
+            if (request.getDataUrl() == null || request.getDataUrl().isEmpty()) {
+                log.warn("User {} attempted to save signature without dataUrl", username);
+                return ResponseEntity.badRequest().build();
+            }
+
+            SavedSignatureResponse response = signatureService.saveSignature(username, request);
+            log.info("User {} saved signature {}", username, request.getId());
+            return ResponseEntity.ok(response);
+        } catch (IllegalArgumentException e) {
+            log.warn("Invalid signature save request: {}", e.getMessage());
+            return ResponseEntity.badRequest().build();
+        } catch (IOException e) {
+            log.error("Failed to save signature", e);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    /**
+     * List all signatures accessible to the authenticated user. Includes both personal and shared
+     * signatures.
+     */
+    @GetMapping
+    public ResponseEntity<List<SavedSignatureResponse>> listSignatures() {
+        try {
+            String username = userService.getCurrentUsername();
+            List<SavedSignatureResponse> signatures = signatureService.getSavedSignatures(username);
+            return ResponseEntity.ok(signatures);
+        } catch (IOException e) {
+            log.error("Failed to list signatures for user", e);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    /**
+     * Delete a signature owned by the authenticated user. Users can only delete their own personal
+     * signatures, not shared ones.
+     */
+    @DeleteMapping("/{signatureId}")
+    public ResponseEntity<Void> deleteSignature(@PathVariable String signatureId) {
+        try {
+            String username = userService.getCurrentUsername();
+            signatureService.deleteSignature(username, signatureId);
+            log.info("User {} deleted signature {}", username, signatureId);
+            return ResponseEntity.noContent().build();
+        } catch (IOException e) {
+            log.warn("Failed to delete signature {} for user: {}", signatureId, e.getMessage());
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        }
+    }
+}
@@ -34,7 +34,19 @@ import stirling.software.proprietary.util.FormUtils;

@RestController
@RequestMapping("/api/v1/form")
-@Tag(name = "Forms", description = "PDF form APIs")
+@Tag(
+        name = "Forms",
+        description =
+                """
+                Work with PDF form fields: read them, fill them, edit them, or remove them.
+                Treats a PDF as a structured form instead of just flat pages.
+
+                Typical uses:
+                • Inspect which form fields exist in a PDF
+                • Autofill forms from your own systems (e.g. CRM, ERP)
+                • Change or delete form fields before sending out a final, non-editable copy
+                • Unlock read-only form fields when you need to update them
+                """)
@RequiredArgsConstructor
 public class FormFillController {

@@ -0,0 +1,18 @@
+package stirling.software.proprietary.model.api.signature;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+public class SavedSignatureRequest {
+    private String id;
+    private String label;
+    private String type; // "canvas", "image", "text"
+    private String scope; // "personal", "shared"
+    private String dataUrl; // For canvas and image types
+    private String signerName; // For text type
+    private String fontFamily; // For text type
+    private Integer fontSize; // For text type
+    private String textColor; // For text type
+}
@@ -0,0 +1,22 @@
+package stirling.software.proprietary.model.api.signature;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SavedSignatureResponse {
+    private String id;
+    private String label;
+    private String type; // "canvas", "image", "text"
+    private String scope; // "personal", "shared"
+    private String dataUrl; // For canvas and image types (or URL to fetch image)
+    private String signerName; // For text type
+    private String fontFamily; // For text type
+    private Integer fontSize; // For text type
+    private String textColor; // For text type
+    private Long createdAt;
+    private Long updatedAt;
+}
@@ -35,15 +35,40 @@ public class MailConfig {
        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
        mailSender.setHost(mailProperties.getHost());
        mailSender.setPort(mailProperties.getPort());
-        mailSender.setUsername(mailProperties.getUsername());
-        mailSender.setPassword(mailProperties.getPassword());
        mailSender.setDefaultEncoding("UTF-8");

+        // Only set username and password if they are provided
+        String username = mailProperties.getUsername();
+        String password = mailProperties.getPassword();
+        boolean hasCredentials =
+                (username != null && !username.trim().isEmpty())
+                        || (password != null && !password.trim().isEmpty());
+
+        if (username != null && !username.trim().isEmpty()) {
+            mailSender.setUsername(username);
+            log.info("SMTP username configured");
+        } else {
+            log.info("SMTP username not configured - using anonymous connection");
+        }
+
+        if (password != null && !password.trim().isEmpty()) {
+            mailSender.setPassword(password);
+            log.info("SMTP password configured");
+        } else {
+            log.info("SMTP password not configured");
+        }
+
        // Retrieves the JavaMail properties to configure additional SMTP parameters
        Properties props = mailSender.getJavaMailProperties();

-        // Enables SMTP authentication
-        props.put("mail.smtp.auth", "true");
+        // Only enable SMTP authentication if credentials are provided
+        if (hasCredentials) {
+            props.put("mail.smtp.auth", "true");
+            log.info("SMTP authentication enabled");
+        } else {
+            props.put("mail.smtp.auth", "false");
+            log.info("SMTP authentication disabled - no credentials provided");
+        }

        // Enables STARTTLS to encrypt the connection if supported by the SMTP server
        props.put("mail.smtp.starttls.enable", "true");
@@ -1,22 +1,32 @@
 package stirling.software.proprietary.security.controller.api;

+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.Map;

 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;

 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import lombok.extern.slf4j.Slf4j;

+import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier;
@@ -242,4 +252,154 @@ public class AdminLicenseController {
                    .body(Map.of("error", "Failed to retrieve license information"));
        }
    }
+
+    /**
+     * Upload a license certificate file for offline activation. Accepts .lic or .cert files,
+     * validates the certificate format, saves to configs directory, and activates the license.
+     *
+     * @param file The license certificate file to upload
+     * @return Response with success status, license type, and file information
+     */
+    @PostMapping(value = "/license-file", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(
+            summary = "Upload license certificate file",
+            description =
+                    "Upload a license certificate file (.lic, .cert) for offline activation."
+                            + " Validates the file format and activates the license.")
+    public ResponseEntity<Map<String, Object>> uploadLicenseFile(
+            @RequestParam("file") MultipartFile file) {
+
+        // Validate file exists
+        if (file == null || file.isEmpty()) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("success", false, "error", "File is empty"));
+        }
+
+        String filename = file.getOriginalFilename();
+        if (filename == null || filename.trim().isEmpty()) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("success", false, "error", "Invalid filename"));
+        }
+        // Prevent path traversal and enforce single filename component
+        if (filename.contains("..") || filename.contains("/") || filename.contains("\\")) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("success", false, "error", "Filename must not contain path separators or '..'"));
+        }
+
+        // Validate file extension
+        if (!isValidLicenseFile(filename)) {
+            return ResponseEntity.badRequest()
+                    .body(
+                            Map.of(
+                                    "success",
+                                    false,
+                                    "error",
+                                    "Invalid file type. Expected .lic or .cert"));
+        }
+
+        // Check file size (max 1MB for license files)
+        if (file.getSize() > 1_048_576) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("success", false, "error", "File too large. Maximum 1MB allowed"));
+        }
+
+        try {
+            // Validate certificate format by reading content
+            byte[] fileBytes = file.getBytes();
+            String content = new String(fileBytes, StandardCharsets.UTF_8);
+            if (!content.trim().startsWith("-----BEGIN LICENSE FILE-----")) {
+                return ResponseEntity.badRequest()
+                        .body(
+                                Map.of(
+                                        "success",
+                                        false,
+                                        "error",
+                                        "Invalid license certificate format"));
+            }
+
+            // Get config directory and target path
+            Path configPath = Paths.get(InstallationPathConfig.getConfigPath());
+            Path targetPath = configPath.resolve(filename).normalize();
+            // Prevent directory traversal: ensure targetPath is inside configPath
+            if (!targetPath.startsWith(configPath.normalize().toAbsolutePath())) {
+                return ResponseEntity.badRequest()
+                        .body(Map.of("success", false, "error", "Invalid file path"));
+            }
+
+            // Backup existing file if present
+            if (Files.exists(targetPath)) {
+                Path backupDir = configPath.resolve("backup");
+                Files.createDirectories(backupDir);
+
+                String backupFilename = filename + ".bak." + System.currentTimeMillis();
+                Path backupPath = backupDir.resolve(backupFilename);
+
+                Files.copy(targetPath, backupPath, StandardCopyOption.REPLACE_EXISTING);
+                log.info("Backed up existing license file to: {}", backupPath);
+            }
+
+            // Write new license file
+            Files.write(targetPath, fileBytes);
+            log.info("License file saved to: {}", targetPath);
+
+            // assume premium enabled when setting license key
+            applicationProperties.getPremium().setEnabled(true);
+
+            // Update settings with file reference (relative path)
+            String fileReference = "file:configs/" + filename;
+            licenseKeyChecker.updateLicenseKey(fileReference);
+
+            // Get license status after activation
+            License license = licenseKeyChecker.getPremiumLicenseEnabledResult();
+
+            Map<String, Object> response = new HashMap<>();
+            response.put("success", true);
+            response.put("licenseType", license.name());
+            response.put("filename", filename);
+            response.put("filePath", "configs/" + filename);
+            response.put("enabled", applicationProperties.getPremium().isEnabled());
+            response.put("maxUsers", applicationProperties.getPremium().getMaxUsers());
+            response.put("message", "License file uploaded and activated");
+
+            log.info(
+                    "License file uploaded and activated: filename={}, type={}",
+                    filename,
+                    license.name());
+
+            return ResponseEntity.ok(response);
+
+        } catch (IOException e) {
+            log.error("Failed to save license file", e);
+            return ResponseEntity.internalServerError()
+                    .body(
+                            Map.of(
+                                    "success",
+                                    false,
+                                    "error",
+                                    "Failed to save license file: " + e.getMessage()));
+        } catch (Exception e) {
+            log.error("Failed to activate license from file", e);
+            return ResponseEntity.badRequest()
+                    .body(
+                            Map.of(
+                                    "success",
+                                    false,
+                                    "error",
+                                    "Failed to activate license: " + e.getMessage()));
+        }
+    }
+
+    /**
+     * Validates if the filename has a valid license file extension (.lic or .cert)
+     *
+     * @param filename The filename to validate
+     * @return true if the filename ends with .lic or .cert (case-insensitive)
+     */
+    private boolean isValidLicenseFile(String filename) {
+        if (filename == null) {
+            return false;
+        }
+        String lower = filename.toLowerCase();
+        return lower.endsWith(".lic") || lower.endsWith(".cert");
+    }
 }
@@ -407,7 +407,8 @@ public class UserController {
    public ResponseEntity<?> inviteUsers(
            @RequestParam(name = "emails", required = true) String emails,
            @RequestParam(name = "role", defaultValue = "ROLE_USER") String role,
-            @RequestParam(name = "teamId", required = false) Long teamId)
+            @RequestParam(name = "teamId", required = false) Long teamId,
+            HttpServletRequest request)
            throws SQLException, UnsupportedProviderException {

        // Check if email invites are enabled
@@ -477,6 +478,9 @@ public class UserController {
            }
        }

+        // Build login URL
+        String loginUrl = buildLoginUrl(request);
+
        int successCount = 0;
        int failureCount = 0;
        StringBuilder errors = new StringBuilder();
@@ -488,7 +492,7 @@ public class UserController {
                continue;
            }

-            InviteResult result = processEmailInvite(email, effectiveTeamId, role);
+            InviteResult result = processEmailInvite(email, effectiveTeamId, role, loginUrl);
            if (result.isSuccess()) {
                successCount++;
            } else {
@@ -687,15 +691,45 @@ public class UserController {
        return ResponseEntity.ok(apiKey);
    }

+    /**
+     * Helper method to build the login URL from the application configuration or request.
+     *
+     * @param request The HTTP request
+     * @return The login URL
+     */
+    private String buildLoginUrl(HttpServletRequest request) {
+        String baseUrl;
+        String configuredFrontendUrl = applicationProperties.getSystem().getFrontendUrl();
+        if (configuredFrontendUrl != null && !configuredFrontendUrl.trim().isEmpty()) {
+            // Use configured frontend URL (remove trailing slash if present)
+            baseUrl =
+                    configuredFrontendUrl.endsWith("/")
+                            ? configuredFrontendUrl.substring(0, configuredFrontendUrl.length() - 1)
+                            : configuredFrontendUrl;
+        } else {
+            // Fall back to backend URL from request
+            baseUrl =
+                    request.getScheme()
+                            + "://"
+                            + request.getServerName()
+                            + (request.getServerPort() != 80 && request.getServerPort() != 443
+                                    ? ":" + request.getServerPort()
+                                    : "");
+        }
+        return baseUrl + "/login";
+    }
+
    /**
     * Helper method to process a single email invitation.
     *
     * @param email The email address to invite
     * @param teamId The team ID to assign the user to
     * @param role The role to assign to the user
+     * @param loginUrl The URL to the login page
     * @return InviteResult containing success status and optional error message
     */
-    private InviteResult processEmailInvite(String email, Long teamId, String role) {
+    private InviteResult processEmailInvite(
+            String email, Long teamId, String role, String loginUrl) {
        try {
            // Validate email format (basic check)
            if (!email.contains("@") || !email.contains(".")) {
@@ -715,7 +749,7 @@ public class UserController {

            // Send invite email
            try {
-                emailService.get().sendInviteEmail(email, email, temporaryPassword);
+                emailService.get().sendInviteEmail(email, email, temporaryPassword, loginUrl);
                log.info("Sent invite email to: {}", email);
                return InviteResult.success();
            } catch (Exception emailEx) {
@@ -299,7 +299,8 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
            contextPath + "/api/v1/auth/refresh",
            contextPath + "/api/v1/auth/me",
            contextPath + "/api/v1/invite/validate",
-            contextPath + "/api/v1/invite/accept"
+            contextPath + "/api/v1/invite/accept",
+            contextPath + "/api/v1/ui-data/footer-info"
        };

        for (String pattern : publicApiPatterns) {
@@ -115,10 +115,12 @@ public class EmailService {
     * @param to The recipient email address
     * @param username The username for the new account
     * @param temporaryPassword The temporary password
+     * @param loginUrl The URL to the login page
     * @throws MessagingException If there is an issue with creating or sending the email.
     */
    @Async
-    public void sendInviteEmail(String to, String username, String temporaryPassword)
+    public void sendInviteEmail(
+            String to, String username, String temporaryPassword, String loginUrl)
            throws MessagingException {
        String subject = "Welcome to Stirling PDF";

@@ -144,6 +146,14 @@ public class EmailService {
                      <div style="background-color: #fff3cd; border-left: 4px solid #ffc107; padding: 15px; margin: 20px 0; border-radius: 4px;">
                        <p style="margin: 0; color: #856404;"><strong>⚠️ Important:</strong> You will be required to change your password upon first login for security reasons.</p>
                      </div>
+                      <!-- CTA Button -->
+                      <div style="text-align: center; margin: 30px 0;">
+                        <a href="%s" style="display: inline-block; background-color: #007bff; color: #ffffff; padding: 14px 28px; text-decoration: none; border-radius: 5px; font-weight: bold;">Log In to Stirling PDF</a>
+                      </div>
+                      <p style="font-size: 14px; color: #666;">Or copy and paste this link in your browser:</p>
+                      <div style="background-color: #f8f9fa; padding: 12px; margin: 15px 0; border-radius: 4px; word-break: break-all; font-size: 13px; color: #555;">
+                        %s
+                      </div>
                      <p>Please keep these credentials secure and do not share them with anyone.</p>
                      <p style="margin-bottom: 0;">— The Stirling PDF Team</p>
                    </div>
@@ -155,7 +165,7 @@ public class EmailService {
                </div>
                </body></html>
                """
-                        .formatted(username, temporaryPassword);
+                        .formatted(username, temporaryPassword, loginUrl, loginUrl);

        sendPlainEmail(to, subject, body, true);
    }
@@ -0,0 +1,299 @@
+package stirling.software.proprietary.service;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.service.PersonalSignatureServiceInterface;
+import stirling.software.proprietary.model.api.signature.SavedSignatureRequest;
+import stirling.software.proprietary.model.api.signature.SavedSignatureResponse;
+
+/**
+ * Service for managing user signatures with authentication and storage limits. This proprietary
+ * version enforces per-user quotas and requires authentication. Provides access to personal
+ * signatures only (shared signatures handled by core service).
+ */
+@Service
+@Slf4j
+public class SignatureService implements PersonalSignatureServiceInterface {
+
+    private final String SIGNATURE_BASE_PATH;
+    private final String ALL_USERS_FOLDER = "ALL_USERS";
+
+    // Storage limits per user
+    private static final int MAX_SIGNATURES_PER_USER = 20;
+    private static final long MAX_SIGNATURE_SIZE_BYTES = 2_000_000; // 2MB per signature
+    private static final long MAX_TOTAL_USER_STORAGE_BYTES = 20_000_000; // 20MB total per user
+
+    public SignatureService() {
+        SIGNATURE_BASE_PATH = InstallationPathConfig.getSignaturesPath();
+    }
+
+    /**
+     * Get a personal signature from the user's folder only. Does NOT check shared folder (that's
+     * handled by core service).
+     */
+    @Override
+    public byte[] getPersonalSignatureBytes(String username, String fileName) throws IOException {
+        validateFileName(fileName);
+        Path userPath = Paths.get(SIGNATURE_BASE_PATH, username, fileName);
+
+        if (!Files.exists(userPath)) {
+            throw new FileNotFoundException("Personal signature not found");
+        }
+
+        return Files.readAllBytes(userPath);
+    }
+
+    /** Save a signature with storage limits enforced. */
+    public SavedSignatureResponse saveSignature(String username, SavedSignatureRequest request)
+            throws IOException {
+        validateFileName(request.getId());
+
+        // Determine folder based on scope
+        String scope = request.getScope();
+        if (scope == null || scope.isEmpty()) {
+            scope = "personal"; // Default to personal
+        }
+
+        String folderName = "shared".equals(scope) ? ALL_USERS_FOLDER : username;
+        Path targetFolder = Paths.get(SIGNATURE_BASE_PATH, folderName);
+
+        // Only enforce limits for personal signatures (not shared)
+        if ("personal".equals(scope)) {
+            enforceStorageLimits(username, request.getDataUrl());
+        }
+
+        Files.createDirectories(targetFolder);
+
+        long timestamp = System.currentTimeMillis();
+
+        SavedSignatureResponse response = new SavedSignatureResponse();
+        response.setId(request.getId());
+        response.setLabel(request.getLabel());
+        response.setType(request.getType());
+        response.setScope(scope);
+        response.setCreatedAt(timestamp);
+        response.setUpdatedAt(timestamp);
+
+        // Extract and save image data
+        String dataUrl = request.getDataUrl();
+        if (dataUrl != null && dataUrl.startsWith("data:image/")) {
+            // Validate dataUrl size before decoding
+            if (dataUrl.length() > MAX_SIGNATURE_SIZE_BYTES * 2) {
+                throw new IllegalArgumentException(
+                        "Signature data too large (max "
+                                + (MAX_SIGNATURE_SIZE_BYTES / 1024)
+                                + "KB)");
+            }
+
+            // Extract base64 data
+            String base64Data = dataUrl.substring(dataUrl.indexOf(",") + 1);
+            byte[] imageBytes = Base64.getDecoder().decode(base64Data);
+
+            // Validate decoded size
+            if (imageBytes.length > MAX_SIGNATURE_SIZE_BYTES) {
+                throw new IllegalArgumentException(
+                        "Signature image too large (max "
+                                + (MAX_SIGNATURE_SIZE_BYTES / 1024)
+                                + "KB)");
+            }
+
+            // Determine and validate file extension from data URL
+            String mimeType = dataUrl.substring(dataUrl.indexOf(":") + 1, dataUrl.indexOf(";"));
+            String rawExtension = mimeType.substring(mimeType.indexOf("/") + 1);
+            String extension = validateAndNormalizeExtension(rawExtension);
+
+            // Save image file
+            String imageFileName = request.getId() + "." + extension;
+            Path imagePath = targetFolder.resolve(imageFileName);
+
+            // Verify path is within target directory
+            verifyPathWithinDirectory(imagePath, targetFolder);
+
+            Files.write(
+                    imagePath,
+                    imageBytes,
+                    StandardOpenOption.CREATE,
+                    StandardOpenOption.TRUNCATE_EXISTING);
+
+            // Store reference to image file (unified endpoint for all signatures)
+            response.setDataUrl("/api/v1/general/signatures/" + imageFileName);
+        }
+
+        log.info("Saved signature {} for user {} (scope: {})", request.getId(), username, scope);
+        return response;
+    }
+
+    /** Get all saved signatures for a user (personal + shared). */
+    public List<SavedSignatureResponse> getSavedSignatures(String username) throws IOException {
+        List<SavedSignatureResponse> signatures = new ArrayList<>();
+
+        // Load personal signatures
+        Path personalFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+        if (Files.exists(personalFolder)) {
+            signatures.addAll(loadSignaturesFromFolder(personalFolder, "personal", true));
+        }
+
+        // Load shared signatures
+        Path sharedFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
+        if (Files.exists(sharedFolder)) {
+            signatures.addAll(loadSignaturesFromFolder(sharedFolder, "shared", false));
+        }
+
+        return signatures;
+    }
+
+    /** Delete a signature from user's personal folder. Cannot delete shared signatures. */
+    public void deleteSignature(String username, String signatureId) throws IOException {
+        validateFileName(signatureId);
+
+        // Only allow deletion from personal folder
+        Path personalFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+        boolean deleted = false;
+
+        if (Files.exists(personalFolder)) {
+            try (Stream<Path> stream = Files.list(personalFolder)) {
+                List<Path> matchingFiles =
+                        stream.filter(
+                                        path ->
+                                                path.getFileName()
+                                                        .toString()
+                                                        .startsWith(signatureId + "."))
+                                .toList();
+                for (Path file : matchingFiles) {
+                    Files.delete(file);
+                    deleted = true;
+                    log.info("Deleted signature file: {}", file);
+                }
+            }
+        }
+
+        if (!deleted) {
+            throw new FileNotFoundException("Signature not found or cannot be deleted");
+        }
+    }
+
+    // Private helper methods
+
+    private void enforceStorageLimits(String username, String dataUrlToAdd) throws IOException {
+        Path userFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+
+        if (!Files.exists(userFolder)) {
+            return; // First signature, no limits to check
+        }
+
+        // Count existing signatures
+        long signatureCount;
+        try (Stream<Path> stream = Files.list(userFolder)) {
+            signatureCount = stream.filter(this::isImageFile).count();
+        }
+
+        if (signatureCount >= MAX_SIGNATURES_PER_USER) {
+            throw new IllegalArgumentException(
+                    "Maximum signatures limit reached (" + MAX_SIGNATURES_PER_USER + ")");
+        }
+
+        // Calculate total storage used
+        long totalSize = 0;
+        try (Stream<Path> stream = Files.list(userFolder)) {
+            totalSize =
+                    stream.filter(this::isImageFile)
+                            .mapToLong(
+                                    path -> {
+                                        try {
+                                            return Files.size(path);
+                                        } catch (IOException e) {
+                                            return 0;
+                                        }
+                                    })
+                            .sum();
+        }
+
+        // Estimate new signature size (base64 decodes to ~75% of original)
+        long estimatedNewSize = (long) (dataUrlToAdd.length() * 0.75);
+
+        if (totalSize + estimatedNewSize > MAX_TOTAL_USER_STORAGE_BYTES) {
+            throw new IllegalArgumentException(
+                    "Storage quota exceeded (max "
+                            + (MAX_TOTAL_USER_STORAGE_BYTES / 1_000_000)
+                            + "MB)");
+        }
+    }
+
+    private List<SavedSignatureResponse> loadSignaturesFromFolder(
+            Path folder, String scope, boolean isPersonal) throws IOException {
+        List<SavedSignatureResponse> signatures = new ArrayList<>();
+
+        try (Stream<Path> stream = Files.list(folder)) {
+            stream.filter(this::isImageFile)
+                    .forEach(
+                            path -> {
+                                try {
+                                    String fileName = path.getFileName().toString();
+                                    String id = fileName.substring(0, fileName.lastIndexOf('.'));
+
+                                    SavedSignatureResponse sig = new SavedSignatureResponse();
+                                    sig.setId(id);
+                                    sig.setLabel(id);
+                                    sig.setType("image");
+                                    sig.setScope(scope);
+                                    sig.setCreatedAt(Files.getLastModifiedTime(path).toMillis());
+                                    sig.setUpdatedAt(Files.getLastModifiedTime(path).toMillis());
+
+                                    // Set unified URL path (works for both personal and shared)
+                                    sig.setDataUrl("/api/v1/general/signatures/" + fileName);
+
+                                    signatures.add(sig);
+                                } catch (IOException e) {
+                                    log.error("Error reading signature file: " + path, e);
+                                }
+                            });
+        }
+
+        return signatures;
+    }
+
+    private boolean isImageFile(Path path) {
+        String fileName = path.getFileName().toString().toLowerCase();
+        return fileName.endsWith(".jpg") || fileName.endsWith(".jpeg") || fileName.endsWith(".png");
+    }
+
+    private void validateFileName(String fileName) {
+        if (fileName.contains("..") || fileName.contains("/") || fileName.contains("\\")) {
+            throw new IllegalArgumentException("Invalid filename");
+        }
+        if (!fileName.matches("^[a-zA-Z0-9_.-]+$")) {
+            throw new IllegalArgumentException("Filename contains invalid characters");
+        }
+    }
+
+    private String validateAndNormalizeExtension(String extension) {
+        String normalized = extension.toLowerCase().trim();
+        if (normalized.equals("png") || normalized.equals("jpg") || normalized.equals("jpeg")) {
+            return normalized;
+        }
+        throw new IllegalArgumentException("Unsupported image extension: " + extension);
+    }
+
+    private void verifyPathWithinDirectory(Path resolvedPath, Path targetDirectory)
+            throws IOException {
+        Path canonicalTarget = targetDirectory.toAbsolutePath().normalize();
+        Path canonicalResolved = resolvedPath.toAbsolutePath().normalize();
+        if (!canonicalResolved.startsWith(canonicalTarget)) {
+            throw new IOException("Resolved path is outside the target directory");
+        }
+    }
+}
@@ -57,7 +57,7 @@ repositories {

 allprojects {
    group = 'stirling.software'
-    version = '2.0.1'
+    version = '2.0.2'

    configurations.configureEach {
        exclude group: 'commons-logging', module: 'commons-logging'
@@ -455,6 +455,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=18"
      },
@@ -498,6 +499,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=18"
      }
@@ -578,6 +580,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/core/-/core-1.4.1.tgz",
      "integrity": "sha512-TGpxn2CvAKRnOJWJ3bsK+dKBiCp75ehxftRUmv7wAmPomhnG5XrDfoWJungvO+zbbqAwso6PocdeXINVt3hlAw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/engines": "1.4.1",
        "@embedpdf/models": "1.4.1"
@@ -677,6 +680,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-history/-/plugin-history-1.4.1.tgz",
      "integrity": "sha512-5WLDiNMH6tACkLGGv/lJtNsDeozOhSbrh0mjD1btHun8u7Yscu/Vf8tdJRUOsd+nULivo2nQ2NFNKu0OTbVo8w==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -693,6 +697,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-interaction-manager/-/plugin-interaction-manager-1.4.1.tgz",
      "integrity": "sha512-Ng02S9SFIAi9JZS5rI+NXSnZZ1Yk9YYRw4MlN2pig49qOyivZdz0oScZaYxQPewo8ccJkLeghjdeWswOBW/6cA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -710,6 +715,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-loader/-/plugin-loader-1.4.1.tgz",
      "integrity": "sha512-m3ZOk8JygsLxoa4cZ+0BVB5pfRWuBCg2/gPqjhoFZNKTqAFw4J6HGUrhYKg94GRYe+w1cTJl/NbTBYuU5DOrsA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -746,6 +752,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-render/-/plugin-render-1.4.1.tgz",
      "integrity": "sha512-gKCdNKw6WBHBEpTc2DLBWIWOxzsNnaNbpfeY6C4f2Bum0EO+XW3Hl2oIx1uaRHjIhhnXso1J3QweqelsPwDGwg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -780,6 +787,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-scroll/-/plugin-scroll-1.4.1.tgz",
      "integrity": "sha512-Y9O+matB4j4fLim5s/jn7qIi+lMC9vmDJRpJhiWe8bvD9oYLP2xfD/DdhFgAjRKcNhPoxC+j8q8QN5BMeGAv2Q==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -816,6 +824,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-selection/-/plugin-selection-1.4.1.tgz",
      "integrity": "sha512-lo5Ytk1PH0PrRKv6zKVupm4t02VGsqIrnSIeP6NO8Ujx0wfqEhj//sqIuO/EwfFVJD8lcQIP9UUo9y8baCrEog==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -891,6 +900,7 @@
      "resolved": "https://registry.npmjs.org/@embedpdf/plugin-viewport/-/plugin-viewport-1.4.1.tgz",
      "integrity": "sha512-+TgFHKPCLTBiDYe2DdsmTS37hwQgcZ3dYIc7bE0l5cp+GVwouu1h0MTmjL+90loizeWwCiu10E/zXR6hz+CUaQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@embedpdf/models": "1.4.1"
      },
@@ -1046,6 +1056,7 @@
      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
      "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.18.3",
        "@emotion/babel-plugin": "^11.13.5",
@@ -1089,6 +1100,7 @@
      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
      "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.18.3",
        "@emotion/babel-plugin": "^11.13.5",
@@ -2119,6 +2131,7 @@
      "resolved": "https://registry.npmjs.org/@mantine/core/-/core-8.3.6.tgz",
      "integrity": "sha512-paTl+0x+O/QtgMtqVJaG8maD8sfiOdgPmLOyG485FmeGZ1L3KMdEkhxZtmdGlDFsLXhmMGQ57ducT90bvhXX5A==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@floating-ui/react": "^0.27.16",
        "clsx": "^2.1.1",
@@ -2169,6 +2182,7 @@
      "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-8.3.6.tgz",
      "integrity": "sha512-liHfaWXHAkLjJy+Bkr29UsCwAoDQ/a64WrM67lksx8F0qqyjR5RQH8zVlhuOjdpQnwtlUkE/YiTvbJiPcoI0bw==",
      "license": "MIT",
+      "peer": true,
      "peerDependencies": {
        "react": "^18.x || ^19.x"
      }
@@ -2236,6 +2250,7 @@
      "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.5.tgz",
      "integrity": "sha512-8VVxFmp1GIm9PpmnQoCoYo0UWHoOrdA57tDL62vkpzEgvb/d71Wsbv4FRg7r1Gyx7PuSo0tflH34cdl/NvfHNQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.28.4",
        "@mui/core-downloads-tracker": "^7.3.5",
@@ -3168,6 +3183,7 @@
      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-7.9.0.tgz",
      "integrity": "sha512-ggs5k+/0FUJcIgNY08aZTqpBTtbExkJMYMLSMwyucrhtWexVOEY1KJmhBsxf+E/Q15f5rbwBpj+t0t2AW2oCsQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12.16"
      }
@@ -3286,7 +3302,6 @@
      "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.6.tgz",
      "integrity": "sha512-4awhxtMh4cx9blePWl10HRHj8Iivtqj+2QdDCSMDzxG+XKa9+VCNupQuCuvzEhYPzZSrX+0gC+0lHA/0fFKKQQ==",
      "license": "MIT",
-      "peer": true,
      "peerDependencies": {
        "acorn": "^8.9.0"
      }
@@ -4063,6 +4078,7 @@
      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.10.4",
        "@babel/runtime": "^7.12.5",
@@ -4391,6 +4407,7 @@
      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
      "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -4401,6 +4418,7 @@
      "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "peerDependencies": {
        "@types/react": "^19.2.0"
      }
@@ -4470,6 +4488,7 @@
      "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.46.3",
        "@typescript-eslint/types": "8.46.3",
@@ -5183,7 +5202,6 @@
      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
      "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vue/shared": "3.5.24"
      }
@@ -5193,7 +5211,6 @@
      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
      "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vue/reactivity": "3.5.24",
        "@vue/shared": "3.5.24"
@@ -5204,7 +5221,6 @@
      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
      "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vue/reactivity": "3.5.24",
        "@vue/runtime-core": "3.5.24",
@@ -5217,7 +5233,6 @@
      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
      "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vue/compiler-ssr": "3.5.24",
        "@vue/shared": "3.5.24"
@@ -5244,6 +5259,7 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -5651,7 +5667,6 @@
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
      "license": "Apache-2.0",
-      "peer": true,
      "engines": {
        "node": ">= 0.4"
      }
@@ -5928,6 +5943,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.8.19",
        "caniuse-lite": "^1.0.30001751",
@@ -6975,7 +6991,8 @@
      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1521046.tgz",
      "integrity": "sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w==",
      "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
    },
    "node_modules/dezalgo": {
      "version": "1.0.4",
@@ -7370,6 +7387,7 @@
      "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -7540,6 +7558,7 @@
      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@rtsao/scc": "^1.1.0",
        "array-includes": "^3.1.9",
@@ -7706,8 +7725,7 @@
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/espree": {
      "version": "10.4.0",
@@ -7772,7 +7790,6 @@
      "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.1.2.tgz",
      "integrity": "sha512-DgvlIQeowRNyvLPWW4PT7Gu13WznY288Du086E751mwwbsgr29ytBiYeLzAGIo0qk3Ujob0SDk8TiSaM5WQzNg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@jridgewell/sourcemap-codec": "^1.4.15"
      }
@@ -8863,6 +8880,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@babel/runtime": "^7.27.6"
      },
@@ -9339,7 +9357,6 @@
      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
      "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/estree": "^1.0.6"
      }
@@ -9660,6 +9677,7 @@
      "integrity": "sha512-Pcfm3eZ+eO4JdZCXthW9tCDT3nF4K+9dmeZ+5X39n+Kqz0DDIABRP5CAEOHRFZk8RGuC2efksTJxrjp8EXCunQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@acemir/cssom": "^0.9.19",
        "@asamuzakjp/dom-selector": "^6.7.3",
@@ -10246,8 +10264,7 @@
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
      "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/locate-path": {
      "version": "6.0.0",
@@ -11393,6 +11410,7 @@
        }
      ],
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "nanoid": "^3.3.11",
        "picocolors": "^1.1.1",
@@ -11672,6 +11690,7 @@
      "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
      "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
      "license": "MIT",
+      "peer": true,
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/preact"
@@ -12054,6 +12073,7 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -12063,6 +12083,7 @@
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
      "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "scheduler": "^0.27.0"
      },
@@ -13574,7 +13595,6 @@
      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
      "license": "Apache-2.0",
-      "peer": true,
      "engines": {
        "node": ">= 0.4"
      }
@@ -13783,6 +13803,7 @@
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -14084,6 +14105,7 @@
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
      "devOptional": true,
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -14165,6 +14187,7 @@
      "dev": true,
      "hasInstallScript": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "napi-postinstall": "^0.3.0"
      },
@@ -14369,6 +14392,7 @@
      "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.5.0",
@@ -14520,6 +14544,7 @@
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -14533,6 +14558,7 @@
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -15144,8 +15170,7 @@
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz",
      "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/zod": {
      "version": "3.25.76",
@@ -54,17 +54,17 @@
    --cc-secondary-color: #b0b0b0;

    --cc-btn-primary-bg: #4dabf7;
-    --cc-btn-primary-color: #2d2d2d;
+    --cc-btn-primary-color: #ffffff;
    --cc-btn-primary-border-color: #4dabf7;
    --cc-btn-primary-hover-bg: #3d3d3d;
-    --cc-btn-primary-hover-color: #e5e5e5;
+    --cc-btn-primary-hover-color: #ffffff;
    --cc-btn-primary-hover-border-color: #3d3d3d;

    --cc-btn-secondary-bg: #3d3d3d;
-    --cc-btn-secondary-color: #e5e5e5;
+    --cc-btn-secondary-color: #ffffff;
    --cc-btn-secondary-border-color: #3d3d3d;
    --cc-btn-secondary-hover-bg: #4dabf7;
-    --cc-btn-secondary-hover-color: #2d2d2d;
+    --cc-btn-secondary-hover-color: #ffffff;
    --cc-btn-secondary-hover-border-color: #4dabf7;

    --cc-separator-border-color: #555555;
@@ -180,4 +180,27 @@
 /* Lower z-index so cookie banner appears behind onboarding modals */
 #cc-main {
    z-index: 100 !important;
+}
+
+/* Ensure consent modal text is visible in both themes */
+#cc-main .cm {
+    background: var(--cc-bg) !important;
+    color: var(--cc-primary-color) !important;
+}
+
+#cc-main .cm__title {
+    color: var(--cc-primary-color) !important;
+}
+
+#cc-main .cm__desc {
+    color: var(--cc-primary-color) !important;
+}
+
+#cc-main .cm__footer {
+    color: var(--cc-primary-color) !important;
+}
+
+#cc-main .cm__footer-links a,
+#cc-main .cm__link {
+    color: var(--cc-primary-color) !important;
 }
@@ -912,9 +912,6 @@ desc = "ابنِ تدفّقات عمل متعددة الخطوات بسلسلة
 desc = "تراكب ملف PDF فوق آخر"
 title = "تراكب ملفات PDF"

-[home.pdfTextEditor]
-title = "محرر نصوص PDF"
-desc = "مراجعة وتحرير صادرات Stirling PDF بصيغة JSON مع تحرير نصوص مجمّعة وإعادة إنشاء PDF"

 [home.addText]
 tags = "نص,تعليق,تسمية"
@@ -912,9 +912,6 @@ desc = "PDF əməliyyatlarını zəncirləyərək çoxaddımlı iş axınları q
 desc = "Bir PDF-i digərinin üstünə qoyur"
 title = "Üst-Üstə Qoy"

-[home.pdfTextEditor]
-title = "PDF Mətn Redaktoru"
-desc = "Qruplaşdırılmış mətn redaktəsi və PDF yenidən yaradılması ilə Stirling PDF JSON ixraclarını nəzərdən keçirin və redaktə edin"

 [home.addText]
 tags = "mətn,şərh,etiket"
@@ -912,9 +912,6 @@ desc = "Създавайте многостъпкови работни проц
 desc = "Наслагва PDF файлове върху друг PDF"
 title = "Наслагване PDF-и"

-[home.pdfTextEditor]
-title = "PDF текстов редактор"
-desc = "Преглеждайте и редактирайте JSON експорти на Stirling PDF с групово редактиране на текст и повторно генериране на PDF"

 [home.addText]
 tags = "текст,анотация,етикет"
@@ -912,9 +912,6 @@ desc = "Construeix fluxos de treball multietapa enllaçant accions PDF. Ideal pe
 desc = "Superposa PDFs sobre un altre PDF"
 title = "Superposar PDFs"

-[home.pdfTextEditor]
-title = "Editor de text PDF"
-desc = "Revisa i edita exportacions JSON de Stirling PDF amb edició de text agrupada i regeneració del PDF"

 [home.addText]
 tags = "text,anotació,etiqueta"
@@ -912,9 +912,6 @@ desc = "Vytvářejte vícekrokové workflow řetězením akcí PDF. Ideální pr
 desc = "Překryje PDF nad jiným PDF"
 title = "Překrýt PDF"

-[home.pdfTextEditor]
-title = "Editor textu PDF"
-desc = "Prohlížejte a upravujte exporty JSON ze Stirling PDF se skupinovými úpravami textu a regenerací PDF"

 [home.addText]
 tags = "text,anotace,štítek"
@@ -912,9 +912,6 @@ desc = "Byg flertrins-workflows ved at kæde PDF-handlinger sammen. Ideelt til t
 desc = "Overlejrer PDF'er oven på en anden PDF"
 title = "Overlejr PDF'er"

-[home.pdfTextEditor]
-title = "PDF-teksteditor"
-desc = "Gennemse og rediger Stirling PDF JSON-eksporter med grupperet tekstredigering og regenerering af PDF"

 [home.addText]
 tags = "tekst,annotering,etiket"
@@ -912,9 +912,6 @@ desc = "Mehrstufige Arbeitsabläufe durch Verkettung von PDF-Aktionen erstellen.
 desc = "Ein PDF über ein anderes legen"
 title = "PDFs überlagern"

-[home.pdfTextEditor]
-title = "PDF-Texteditor"
-desc = "Stirling PDF JSON-Exporte prüfen und bearbeiten – mit gruppierter Textbearbeitung und PDF-Neuerzeugung"

 [home.addText]
 tags = "text,annotation,label"
@@ -912,9 +912,6 @@ desc = "Δημιουργήστε ροές πολλών βημάτων συνδέ
 desc = "Επικάλυψη PDF πάνω σε άλλο PDF"
 title = "Επικάλυψη PDF"

-[home.pdfTextEditor]
-title = "Επεξεργαστής κειμένου PDF"
-desc = "Επιθεωρήστε και επεξεργαστείτε εξαγωγές JSON του Stirling PDF με ομαδοποιημένη επεξεργασία κειμένου και αναδημιουργία PDF"

 [home.addText]
 tags = "κείμενο,σχολιασμός,ετικέτα"
@@ -919,7 +919,7 @@ title = "Overlay PDFs"

 [home.pdfTextEditor]
 title = "PDF Text Editor"
-desc = "Review and edit Stirling PDF JSON exports with grouped text editing and PDF regeneration"
+desc = "Edit existing text and images inside PDFs"

 [home.addText]
 tags = "text,annotation,label"
@@ -2267,8 +2267,16 @@ defaultCanvasLabel = "Drawing signature"
 defaultImageLabel = "Uploaded signature"
 defaultTextLabel = "Typed signature"
 saveButton = "Save signature"
+savePersonal = "Save Personal"
+saveShared = "Save Shared"
 saveUnavailable = "Create a signature first to save it."
 noChanges = "Current signature is already saved."
+tempStorageTitle = "Temporary browser storage"
+tempStorageDescription = "Signatures are stored in your browser only. They will be lost if you clear browser data or switch browsers."
+personalHeading = "Personal Signatures"
+sharedHeading = "Shared Signatures"
+personalDescription = "Only you can see these signatures."
+sharedDescription = "All users can see and use these signatures."

 [sign.saved.type]
 canvas = "Drawing"
@@ -4508,6 +4516,7 @@ description = "URL or filename to impressum (required in some jurisdictions)"
 title = "Premium & Enterprise"
 description = "Configure your premium or enterprise license key."
 license = "License Configuration"
+noInput = "Please provide a license key or file"

 [admin.settings.premium.licenseKey]
 toggle = "Got a license key or certificate file?"
@@ -4525,6 +4534,26 @@ line1 = "Overwriting your current license key cannot be undone."
 line2 = "Your previous license will be permanently lost unless you have backed it up elsewhere."
 line3 = "Important: Keep license keys private and secure. Never share them publicly."

+[admin.settings.premium.inputMethod]
+text = "License Key"
+file = "Certificate File"
+
+[admin.settings.premium.file]
+label = "License Certificate File"
+description = "Upload your .lic or .cert license file from offline purchases"
+choose = "Choose License File"
+selected = "Selected: {{filename}} ({{size}})"
+successMessage = "License file uploaded and activated successfully. No restart required."
+
+[admin.settings.premium.currentLicense]
+title = "Active License"
+file = "Source: License file ({{path}})"
+key = "Source: License key"
+type = "Type: {{type}}"
+
+noInput = "Please provide a license key or upload a certificate file"
+success = "Success"
+
 [admin.settings.premium.enabled]
 label = "Enable Premium Features"
 description = "Enable license key checks for pro/enterprise features"
@@ -5261,7 +5290,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "At least one email address is required"
 submit = "Send Invites"
 success = "user(s) invited successfully"
-partialSuccess = "Some invites failed"
+partialFailure = "Some invites failed"
 allFailed = "Failed to invite users"
 error = "Failed to send invites"

@@ -5777,7 +5806,7 @@ description = "Sign in with your Stirling account"

 [setup.mode.selfhosted]
 title = "Self-Hosted Server"
-description = "Connect to your own Stirling PDF server"
+description = "Connect to your own Stirling PDF server with your personal account"

 [setup.saas]
 title = "Sign in to Stirling"
@@ -5813,6 +5842,13 @@ submit = "Login"
 signInWith = "Sign in with"
 oauthPending = "Opening browser for authentication..."
 orContinueWith = "Or continue with email"
+serverRequirement = "Note: The server must have login enabled."
+showInstructions = "How to enable?"
+hideInstructions = "Hide instructions"
+instructions = "To enable login on your Stirling PDF server:"
+instructionsEnvVar = "Set the environment variable:"
+instructionsOrYml = "Or in settings.yml:"
+instructionsRestart = "Then restart your server for the changes to take effect."

 [setup.login.username]
 label = "Username"
@@ -912,9 +912,6 @@ desc = "Crear flujos de trabajo de múltiples pasos encadenando acciones de PDF.
 desc = "Superponer PDFs encima de otro PDF"
 title = "Superponer PDFs"

-[home.pdfTextEditor]
-title = "Editor de texto PDF"
-desc = "Revise y edite exportaciones JSON de Stirling PDF con edición de texto agrupada y regeneración de PDF"

 [home.addText]
 tags = "texto,anotación,etiqueta"
@@ -912,9 +912,6 @@ desc = "Eraiki hainbat pausotako workflowak PDF ekintzak kateatuz. Egokia zeregi
 desc = "Overlays PDFs on-top of another PDF"
 title = "Gainjarri PDFak"

-[home.pdfTextEditor]
-title = "PDF testu-editorea"
-desc = "Berrikusi eta editatu Stirling PDF JSON esportazioak taldekatutako testu-edizioarekin eta PDF birsorkuntzarekin"

 [home.addText]
 tags = "testua,anotazioa,etiketa"
@@ -912,9 +912,6 @@ desc = "ساخت گردش‌کارهای چندمرحله‌ای با زنجیر
 desc = "PDF‌ها را بر روی PDF دیگری هم‌پوشانی می‌کند"
 title = "هم‌پوشانی PDF‌ها"

-[home.pdfTextEditor]
-title = "ویرایشگر متن PDF"
-desc = "بازبینی و ویرایش خروجی‌های JSON Stirling PDF با ویرایش گروهی متن و بازتولید PDF"

 [home.addText]
 tags = "متن,حاشیه‌نویسی,برچسب"
@@ -912,9 +912,6 @@ desc = "Créez des workflows multi-étapes en enchaînant des actions PDF. Idéa
 desc = "Superposer un PDF sur un autre"
 title = "Superposer des PDF"

-[home.pdfTextEditor]
-title = "Éditeur de texte PDF"
-desc = "Afficher et modifier les exports JSON de Stirling PDF avec édition de texte groupée et régénération du PDF"

 [home.addText]
 tags = "texte,annotation,étiquette"
@@ -912,9 +912,6 @@ desc = "Tóg sreafaí oibre ilchéime trí ghníomhartha PDF a nascadh le chéil
 desc = "Forleagain PDF ar bharr PDF eile"
 title = "Forleagan PDF"

-[home.pdfTextEditor]
-title = "Eagarthóir Téacs PDF"
-desc = "Athbhreithnigh agus cuir in eagar onnmhairí JSON ó Stirling PDF le heagarthóireacht téacs ghrúpáilte agus athghiniúint PDF"

 [home.addText]
 tags = "téacs,anótáil,lipéad"
@@ -912,9 +912,6 @@ desc = "PDF क्रियाओं को जोड़कर बहु-चर
 desc = "PDF को दूसरी PDF के ऊपर ओवरले करें"
 title = "PDF ओवरले करें"

-[home.pdfTextEditor]
-title = "PDF टेक्स्ट एडिटर"
-desc = "ग्रुप्ड टेक्स्ट एडिटिंग और PDF पुनर्जनन के साथ Stirling PDF JSON एक्सपोर्ट की समीक्षा व संपादन करें"

 [home.addText]
 tags = "text,annotation,label"
@@ -912,9 +912,6 @@ desc = "Izgradite višekoračne tijekove rada povezivanjem PDF radnji. Idealno z
 desc = "Preklapa PDF-ove na drugi PDF"
 title = "Preklapanje PDF-ova"

-[home.pdfTextEditor]
-title = "PDF uređivač teksta"
-desc = "Pregledajte i uredite Stirling PDF JSON izvoze s grupnim uređivanjem teksta i ponovnim generiranjem PDF-a"

 [home.addText]
 tags = "tekst,anotacija,oznaka"
@@ -912,9 +912,6 @@ desc = "Többlépéses munkafolyamatok összeállítása PDF műveletek összef
 desc = "PDF-ek egymásra helyezése egy másik PDF-en"
 title = "PDF-ek egymásra helyezése"

-[home.pdfTextEditor]
-title = "PDF szövegszerkesztő"
-desc = "Nézze át és szerkessze a Stirling PDF JSON exportokat csoportosított szövegszerkesztéssel és PDF-újragenerálással"

 [home.addText]
 tags = "szöveg, megjegyzés, címke"
@@ -912,9 +912,6 @@ desc = "Bangun alur kerja multi-langkah dengan merangkai tindakan PDF. Ideal unt
 desc = "Menumpuk PDF di atas PDF lain"
 title = "Tumpuk PDF"

-[home.pdfTextEditor]
-title = "Editor Teks PDF"
-desc = "Tinjau dan edit ekspor Stirling PDF JSON dengan pengeditan teks terkelompok dan pembuatan ulang PDF"

 [home.addText]
 tags = "teks,anotasi,label"
@@ -912,9 +912,6 @@ desc = "Crea flussi multi‑step concatenando azioni PDF. Ideale per attività r
 desc = "Sovrapponi un PDF sopra un altro"
 title = "Sovrapponi PDF"

-[home.pdfTextEditor]
-title = "Editor testo PDF"
-desc = "Rivedi e modifica le esportazioni JSON di Stirling PDF con modifica testo raggruppata e rigenerazione del PDF"

 [home.addText]
 tags = "testo,annotazione,etichetta"
@@ -912,9 +912,6 @@ desc = "PDF アクションを連結して複数ステップのワークフロ
 desc = "1つのPDFを別のPDFの上に重ねます"
 title = "PDFを重ね合わせ"

-[home.pdfTextEditor]
-title = "PDFテキストエディター"
-desc = "グループ化されたテキスト編集とPDF再生成で、Stirling PDF の JSON エクスポートをレビュー・編集します。"

 [home.addText]
 tags = "テキスト,注釈,ラベル"
@@ -912,9 +912,6 @@ desc = "PDF 작업을 연결하여 다단계 워크플로를 구성하세요.
 desc = "PDF를 다른 PDF 위에 오버레이"
 title = "PDF 오버레이"

-[home.pdfTextEditor]
-title = "PDF 텍스트 편집기"
-desc = "그룹화된 텍스트 편집과 PDF 재생성으로 Stirling PDF의 JSON 내보내기를 검토하고 편집하세요"

 [home.addText]
 tags = "텍스트,주석,레이블"
@@ -912,9 +912,6 @@ desc = "PDF പ്രവർത്തനങ്ങൾ ബന്ധിപ്പി
 desc = "മറ്റൊരു PDF-ന് മുകളിൽ PDF-കൾ ഓവർലേ ചെയ്യുന്നു"
 title = "PDF-കൾ ഓവർലേ ചെയ്യുക"

-[home.pdfTextEditor]
-title = "PDF ടെക്സ്റ്റ് എഡിറ്റർ"
-desc = "ഗ്രൂപ്പുചെയ്ത ടെക്സ്റ്റ് എഡിറ്റിംഗിനോടും PDF വീണ്ടും സൃഷ്ടിക്കുന്നതോടും കൂടി Stirling PDF JSON എക്സ്പോർട്ടുകൾ റിവ്യൂ ചെയ്ത് എഡിറ്റ് ചെയ്യുക"

 [home.addText]
 tags = "text,annotation,label"
@@ -912,9 +912,6 @@ desc = "Bouw workflows met meerdere stappen door PDF-acties te koppelen. Ideaal
 desc = "Plaatst PDF's over een andere PDF heen"
 title = "PDF's overlappen"

-[home.pdfTextEditor]
-title = "PDF-teksteditor"
-desc = "Bekijk en bewerk Stirling PDF JSON-exporten met gegroepeerde tekstbewerking en het opnieuw genereren van PDF's"

 [home.addText]
 tags = "tekst,annotatie,label"
@@ -912,9 +912,6 @@ desc = "Bygg flertrinns arbeidsflyter ved å lenke sammen PDF-handlinger. Ideelt
 desc = "Legger PDF-er over hverandre"
 title = "Overlay PDF-er"

-[home.pdfTextEditor]
-title = "PDF-tekstredigerer"
-desc = "Gå gjennom og rediger Stirling PDF JSON-eksporter med gruppert tekstredigering og regenerering av PDF"

 [home.addText]
 tags = "tekst,merknad,etikett"
@@ -912,9 +912,6 @@ desc = "Buduj wieloetapowe przepływy, łącząc akcje PDF. Idealne do powtarzaj
 desc = "Nakłada dokumenty PDF na siebie"
 title = "Nałóż PDFa"

-[home.pdfTextEditor]
-title = "Edytor tekstu PDF"
-desc = "Przeglądaj i edytuj eksporty JSON z Stirling PDF z grupową edycją tekstu i ponowną generacją PDF"

 [home.addText]
 tags = "tekst,adnotacja,etykieta"
@@ -912,9 +912,6 @@ desc = "Crie fluxos de trabalho de várias etapas encadeando ações de PDF. Ide
 desc = "Sobrepor um PDF sobre outro"
 title = "Sobrepor PDFs"

-[home.pdfTextEditor]
-title = "Editor de texto de PDF"
-desc = "Revise e edite exportações JSON do Stirling PDF com edição de texto agrupada e regeneração do PDF"

 [home.addText]
 tags = "texto,anotação,rótulo"
@@ -912,9 +912,6 @@ desc = "Crie fluxos de trabalho de vários passos encadeando ações de PDF. Ide
 desc = "Sobrepõe PDFs em cima de outro PDF"
 title = "Sobrepor PDFs"

-[home.pdfTextEditor]
-title = "Editor de texto PDF"
-desc = "Revise e edite exportações JSON do Stirling PDF com edição de texto agrupado e regeneração de PDF"

 [home.addText]
 tags = "texto,anotação,etiqueta"
@@ -912,9 +912,6 @@ desc = "Construiți fluxuri cu mai mulți pași legând acțiuni PDF. Ideal pent
 desc = "Suprapune PDF-uri peste alt PDF"
 title = "Suprapune PDF-uri"

-[home.pdfTextEditor]
-title = "Editor text PDF"
-desc = "Revizuiește și editează exporturile JSON Stirling PDF cu editare de text grupată și regenerare PDF"

 [home.addText]
 tags = "text,anotare,etichetă"
@@ -912,9 +912,6 @@ desc = "Создавайте многошаговые процессы, связ
 desc = "Наложить один PDF поверх другого"
 title = "Наложение PDF"

-[home.pdfTextEditor]
-title = "Редактор текста в PDF"
-desc = "Просмотр и редактирование экспортов Stirling PDF в JSON с групповым редактированием текста и регенерацией PDF"

 [home.addText]
 tags = "текст,аннотация,ярлык"
@@ -912,9 +912,6 @@ desc = "Stavať viacstupňové pracovné postupy spájaním akcií PDF. Ideálne
 desc = "Prekrýva PDF súbory na iný PDF"
 title = "Prekrývanie PDF"

-[home.pdfTextEditor]
-title = "Editor textu PDF"
-desc = "Kontrolujte a upravujte Stirling PDF JSON exporty so skupinovými úpravami textu a opätovným vytvorením PDF"

 [home.addText]
 tags = "text,anotácia,štítok"
@@ -912,9 +912,6 @@ desc = "Sestavite večkorakovne poteke z veriženjem dejanj PDF. Idealno za pona
 desc = "Prekriva PDF-je na vrhu drugega PDF-ja"
 title = "Prekrivanje PDF-jev"

-[home.pdfTextEditor]
-title = "Urejevalnik besedila PDF"
-desc = "Pregledujte in urejajte Stirling PDF JSON izvoze z urejanjem združenega besedila in ponovnim ustvarjanjem PDF"

 [home.addText]
 tags = "besedilo,pripomba,oznaka"
@@ -912,9 +912,6 @@ desc = "Gradite višekorake tokove rada povezivanjem PDF akcija. Idealno za pona
 desc = "Preklapa PDF-ove jedan preko drugog"
 title = "Preklapanje PDF-ova"

-[home.pdfTextEditor]
-title = "PDF uređivač teksta"
-desc = "Pregledajte i uređujte Stirling PDF JSON izvoze uz grupisano uređivanje teksta i ponovno generisanje PDF-a"

 [home.addText]
 tags = "tekst,anotacija,oznaka"
@@ -912,9 +912,6 @@ desc = "Skapa flerstegade arbetsflöden genom att kedja ihop PDF‑åtgärder. P
 desc = "Överlagrar PDF:er ovanpå en annan PDF"
 title = "Överlagra PDF:er"

-[home.pdfTextEditor]
-title = "PDF-textredigerare"
-desc = "Granska och redigera Stirling PDF JSON-exporter med grupperad textredigering och PDF-återgenerering"

 [home.addText]
 tags = "text,kommentar,etikett"
@@ -912,9 +912,6 @@ desc = "สร้างเวิร์กโฟลว์หลายขั้น
 desc = "ซ้อนทับ PDF บน PDF อีกไฟล์หนึ่ง"
 title = "ซ้อนทับ PDF"

-[home.pdfTextEditor]
-title = "แก้ไขข้อความ PDF"
-desc = "ตรวจทานและแก้ไขไฟล์ JSON ที่ส่งออกจาก Stirling PDF ด้วยการแก้ไขข้อความแบบกลุ่มและการสร้าง PDF ใหม่"

 [home.addText]
 tags = "text,annotation,label"
@@ -912,9 +912,6 @@ desc = "PDF eylemlerini birbirine bağlayarak çok adımlı iş akışları olu
 desc = "PDF'leri başka bir PDF'nin üzerine bindirir"
 title = "PDF'leri Bindirme"

-[home.pdfTextEditor]
-title = "PDF Metin Düzenleyici"
-desc = "Gruplu metin düzenleme ve PDF yeniden oluşturma ile Stirling PDF JSON dışa aktarımlarını gözden geçirin ve düzenleyin"

 [home.addText]
 tags = "metin,ek açıklama,etiket"
@@ -912,9 +912,6 @@ desc = "Створюйте багатокрокові робочі процес
 desc = "Накладення одного PDF поверх іншого PDF"
 title = "Накладення PDF"

-[home.pdfTextEditor]
-title = "Редактор тексту PDF"
-desc = "Переглядайте й редагуйте JSON-експорти Stirling PDF з груповим редагуванням тексту та повторною генерацією PDF"

 [home.addText]
 tags = "текст,анотація,мітка"
@@ -912,9 +912,6 @@ desc = "Xây dựng quy trình nhiều bước bằng cách xâu chuỗi các th
 desc = "Chồng lớp PDF lên trên PDF khác"
 title = "Chồng lớp PDF"

-[home.pdfTextEditor]
-title = "Trình chỉnh sửa văn bản PDF"
-desc = "Xem và chỉnh sửa xuất JSON của Stirling PDF với chỉnh sửa văn bản theo nhóm và tái tạo PDF"

 [home.addText]
 tags = "văn bản,chú thích,nhãn"
@@ -912,9 +912,6 @@ desc = "通过串联 PDF 动作构建多步工作流。适合重复性任务。"
 desc = "PDF གཞན་ཞིག་གི་སྟེང་དུ་ PDF བརྩེགས་པ།"
 title = "PDF སྟེང་བརྩེགས།"

-[home.pdfTextEditor]
-title = "PDF 文本编辑器"
-desc = "审阅并编辑 Stirling PDF 的 JSON 导出，支持分组文本编辑与 PDF 再生成"

 [home.addText]
 tags = "文本,注释,标签"
@@ -912,9 +912,6 @@ desc = "通过串联 PDF 操作构建多步工作流。适合重复性任务。"
 desc = "将一个 PDF 叠加在另一个之上"
 title = "叠加 PDF"

-[home.pdfTextEditor]
-title = "PDF 文本编辑器"
-desc = "审阅并编辑 Stirling PDF 导出的 JSON，支持分组文本编辑并重新生成 PDF"

 [home.addText]
 tags = "文本,注释,标签"
@@ -912,9 +912,6 @@ desc = "將多個 PDF 動作串接，建立多步驟工作流程。適合重複
 desc = "將 PDF 覆蓋在另一個 PDF 上"
 title = "覆蓋 PDF"

-[home.pdfTextEditor]
-title = "PDF 文字編輯器"
-desc = "檢視與編輯 Stirling PDF 的 JSON 匯出，支援群組文字編輯與重新產生 PDF"

 [home.addText]
 tags = "文字,註解,標籤"
@@ -11,8 +11,8 @@
    {
      "identifier": "http:allow-fetch",
      "allow": [
-        { "url": "http://localhost:*" },
-        { "url": "http://127.0.0.1:*" },
+        { "url": "http://*" },
+        { "url": "http://*:*" },
        { "url": "https://*" }
      ]
    },
@@ -398,10 +398,6 @@ pub async fn start_backend(
        e
    })?;

-    // Wait for the backend to start
-    println!("⏳ Waiting for backend startup...");
-    tokio::time::sleep(std::time::Duration::from_millis(10000)).await;
-
    // Reset the starting flag since startup is complete
    reset_starting_flag();
    add_log("✅ Backend startup sequence completed, starting flag cleared".to_string());
@@ -66,7 +66,7 @@ pub fn run() {
      // Emit a generic notification that files were added (frontend will re-read storage)
      let _ = app.emit("files-changed", ());
    }))
-    .setup(|_app| {
+    .setup(|app| {
      add_log("🚀 Tauri app setup started".to_string());

      // Process command line arguments on first launch
@@ -78,6 +78,17 @@ pub fn run() {
        }
      }

+      // Start backend immediately, non-blocking
+      let app_handle = app.handle().clone();
+
+      tauri::async_runtime::spawn(async move {
+        add_log("🚀 Starting bundled backend in background".to_string());
+        let connection_state = app_handle.state::<AppConnectionState>();
+        if let Err(e) = commands::backend::start_backend(app_handle.clone(), connection_state).await {
+          add_log(format!("⚠️ Backend start failed: {}", e));
+        }
+      });
+
      add_log("🔍 DEBUG: Setup completed".to_string());
      Ok(())
    })
@@ -3,6 +3,7 @@ Version=1.0
 Type=Application
 Name=Stirling-PDF
 Comment=Locally hosted web application that allows you to perform various operations on PDF files
+Exec=/usr/bin/stirling-pdf
 Icon={{icon}}
 Terminal=false
 MimeType=application/pdf;
@@ -1,6 +1,7 @@
 import { Flex } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { useCookieConsent } from '@app/hooks/useCookieConsent';
+import { useFooterInfo } from '@app/hooks/useFooterInfo';

 interface FooterProps {
  privacyPolicy?: string;
@@ -9,6 +10,7 @@ interface FooterProps {
  cookiePolicy?: string;
  impressum?: string;
  analyticsEnabled?: boolean;
+  forceLightMode?: boolean;
 }

 export default function Footer({
@@ -17,10 +19,36 @@ export default function Footer({
  accessibilityStatement,
  cookiePolicy,
  impressum,
-  analyticsEnabled = false
+  analyticsEnabled,
+  forceLightMode = false
 }: FooterProps) {
  const { t } = useTranslation();
-  const { showCookiePreferences } = useCookieConsent({ analyticsEnabled });
+  const { footerInfo } = useFooterInfo();
+
+  console.log('[Footer] Props analyticsEnabled:', analyticsEnabled);
+  console.log('[Footer] Fetched footerInfo:', footerInfo);
+
+  // Use props if provided, otherwise fall back to fetched footer info
+  const finalAnalyticsEnabled = analyticsEnabled ?? footerInfo?.analyticsEnabled ?? false;
+  const finalPrivacyPolicy = privacyPolicy ?? footerInfo?.privacyPolicy;
+  const finalTermsAndConditions = termsAndConditions ?? footerInfo?.termsAndConditions;
+  const finalAccessibilityStatement = accessibilityStatement ?? footerInfo?.accessibilityStatement;
+  const finalCookiePolicy = cookiePolicy ?? footerInfo?.cookiePolicy;
+  const finalImpressum = impressum ?? footerInfo?.impressum;
+
+  console.log('[Footer] Final analyticsEnabled:', finalAnalyticsEnabled);
+
+  const { showCookiePreferences } = useCookieConsent({ analyticsEnabled: finalAnalyticsEnabled, forceLightMode });
+
+  // Default URLs
+  const defaultTermsUrl = "https://www.stirling.com/legal/terms-of-service";
+  const defaultPrivacyUrl = "https://www.stirling.com/legal/privacy-policy";
+  const defaultAccessibilityUrl = "https://www.stirling.com/accessibility";
+
+  // Use provided URLs or fall back to defaults
+  const finalTermsUrl = finalTermsAndConditions || defaultTermsUrl;
+  const finalPrivacyUrl = finalPrivacyPolicy || defaultPrivacyUrl;
+  const finalAccessibilityUrl = finalAccessibilityStatement || defaultAccessibilityUrl;

  // Helper to check if a value is valid (not null/undefined/empty string)
  const isValidLink = (link?: string) => link && link.trim().length > 0;
@@ -28,8 +56,8 @@ export default function Footer({
  return (
    <div style={{
      height: 'var(--footer-height)',
-      backgroundColor: 'var(--mantine-color-gray-1)',
-      borderTop: '1px solid var(--mantine-color-gray-2)',
+      backgroundColor: forceLightMode ? '#f1f3f5' : 'var(--mantine-color-gray-1)',
+      borderTop: forceLightMode ? '1px solid #e9ecef' : '1px solid var(--mantine-color-gray-2)',
      display: 'flex',
      flexDirection: 'column',
      justifyContent: 'center',
@@ -38,7 +66,10 @@ export default function Footer({
          justify="center"
          align="center"
          direction="row"
-          style={{ fontSize: '0.75rem' }}>
+          style={{
+            fontSize: '0.75rem',
+            color: forceLightMode ? '#495057' : undefined
+          }}>
          <a
            className="footer-link px-3"
            id="survey"
@@ -48,57 +79,51 @@ export default function Footer({
          >
            {t('survey.nav', 'Survey')}
          </a>
-          {isValidLink(privacyPolicy) && (
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={finalPrivacyUrl}
+          >
+            {t('legal.privacy', 'Privacy Policy')}
+          </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={finalTermsUrl}
+          >
+            {t('legal.terms', 'Terms and Conditions')}
+          </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href={finalAccessibilityUrl}
+          >
+            {t('legal.accessibility', 'Accessibility')}
+          </a>
+          {isValidLink(finalCookiePolicy) && (
            <a
              className="footer-link px-3"
              target="_blank"
              rel="noopener noreferrer"
-              href={privacyPolicy}
-            >
-              {t('legal.privacy', 'Privacy Policy')}
-            </a>
-          )}
-          {isValidLink(termsAndConditions) && (
-            <a
-              className="footer-link px-3"
-              target="_blank"
-              rel="noopener noreferrer"
-              href={termsAndConditions}
-            >
-              {t('legal.terms', 'Terms and Conditions')}
-            </a>
-          )}
-          {isValidLink(accessibilityStatement) && (
-            <a
-              className="footer-link px-3"
-              target="_blank"
-              rel="noopener noreferrer"
-              href={accessibilityStatement}
-            >
-              {t('legal.accessibility', 'Accessibility')}
-            </a>
-          )}
-          {isValidLink(cookiePolicy) && (
-            <a
-              className="footer-link px-3"
-              target="_blank"
-              rel="noopener noreferrer"
-              href={cookiePolicy}
+              href={finalCookiePolicy}
            >
              {t('legal.cookie', 'Cookie Policy')}
            </a>
          )}
-          {isValidLink(impressum) && (
+          {isValidLink(finalImpressum) && (
            <a
              className="footer-link px-3"
              target="_blank"
              rel="noopener noreferrer"
-              href={impressum}
+              href={finalImpressum}
            >
              {t('legal.impressum', 'Impressum')}
            </a>
          )}
-          {analyticsEnabled && (
+          {finalAnalyticsEnabled && (
            <button
              className="footer-link px-3"
              id="cookieBanner"
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Menu, Button, ScrollArea, ActionIcon, Tooltip } from '@mantine/core';
+import { Menu, Button, ActionIcon } from '@mantine/core';
+import { Tooltip } from '@app/components/shared/Tooltip';
 import { useTranslation } from 'react-i18next';
 import { supportedLanguages } from '@app/i18n';
 import LocalIcon from '@app/components/shared/LocalIcon';
@@ -11,6 +12,7 @@ interface LanguageSelectorProps {
  position?: React.ComponentProps<typeof Menu>['position'];
  offset?: number;
  compact?: boolean; // icon-only trigger
+  tooltip?: string; // tooltip text for compact mode
 }

 interface LanguageOption {
@@ -51,7 +53,7 @@ const LanguageItem: React.FC<LanguageItemProps> = ({
  const { t } = useTranslation();

  const label = disabled ? (
-    <Tooltip label={t('comingSoon', 'Coming soon')} position="left" withArrow>
+    <Tooltip content={t('comingSoon', 'Coming soon')} position="left" arrow>
      <p>{option.label}</p>
    </Tooltip>
  ) : (
@@ -64,7 +66,7 @@ const LanguageItem: React.FC<LanguageItemProps> = ({
      style={{
        opacity: animationTriggered ? 1 : 0,
        transform: animationTriggered ? 'translateY(0px)' : 'translateY(8px)',
-        transition: `opacity 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94) ${index * 0.02}s, transform 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94) ${index * 0.02}s`,
+        transition: `opacity 0.15s cubic-bezier(0.25, 0.46, 0.45, 0.94) ${index * 0.01}s, transform 0.15s cubic-bezier(0.25, 0.46, 0.45, 0.94) ${index * 0.01}s`,
      }}
    >
      <Button
@@ -90,7 +92,7 @@ const LanguageItem: React.FC<LanguageItemProps> = ({
              : isSelected
              ? 'light-dark(var(--mantine-color-blue-9), var(--mantine-color-white))'
              : 'light-dark(var(--mantine-color-gray-7), var(--mantine-color-white))',
-            transition: 'all 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94)',
+            transition: 'all 0.12s cubic-bezier(0.25, 0.46, 0.45, 0.94)',
            cursor: disabled ? 'not-allowed' : 'pointer',
            '&:hover': !disabled ? {
              backgroundColor: isSelected
@@ -126,7 +128,7 @@ const LanguageItem: React.FC<LanguageItemProps> = ({
              backgroundColor: 'var(--mantine-color-blue-4)',
              opacity: 0.6,
              transform: 'translate(-50%, -50%)',
-              animation: 'ripple-expand 0.6s cubic-bezier(0.25, 0.46, 0.45, 0.94)',
+              animation: 'ripple-expand 0.4s cubic-bezier(0.25, 0.46, 0.45, 0.94)',
              zIndex: 1,
            }}
          />
@@ -149,7 +151,12 @@ const RippleStyles: React.FC = () => (
 );

 // Main component
-const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-start', offset = 8, compact = false }) => {
+const LanguageSelector: React.FC<LanguageSelectorProps> = ({
+  position = 'bottom-start',
+  offset = 8,
+  compact = false,
+  tooltip
+}) => {
  const { i18n } = useTranslation();
  const [opened, setOpened] = useState(false);
  const [animationTriggered, setAnimationTriggered] = useState(false);
@@ -184,14 +191,14 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
        setOpened(false);

        // Clear ripple effect
-        setTimeout(() => setRippleEffect(null), 100);
+        setTimeout(() => setRippleEffect(null), 50);

        // Force a full reload so RTL/LTR layout and tooltips re-evaluate correctly
        if (typeof window !== 'undefined') {
          window.location.reload();
        }
-      }, 300);
-    }, 200);
+      }, 150);
+    }, 100);
  };

  const currentLanguage = supportedLanguages[i18n.language as keyof typeof supportedLanguages] ||
@@ -202,7 +209,7 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
    if (opened) {
      setAnimationTriggered(false);
      // Small delay to ensure DOM is ready
-      setTimeout(() => setAnimationTriggered(true), 50);
+      setTimeout(() => setAnimationTriggered(true), 20);
    }
  }, [opened]);

@@ -218,7 +225,7 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
        zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}
        transitionProps={{
          transition: 'scale-y',
-          duration: 200,
+          duration: 120,
          timingFunction: 'cubic-bezier(0.25, 0.46, 0.45, 0.94)'
        }}
      >
@@ -227,8 +234,8 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
            <ActionIcon
              variant="subtle"
              radius="md"
-              title={currentLanguage}
              className="right-rail-icon"
+              title={!opened && tooltip ? tooltip : undefined}
              styles={{
                root: {
                  color: 'var(--right-rail-icon)',
@@ -274,8 +281,7 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
            zIndex: Z_INDEX_OVER_FULLSCREEN_SURFACE,
          }}
        >
-          <ScrollArea h={190} type="scroll">
-            <div className={styles.languageGrid}>
+          <div className={styles.languageGrid}>
              {languageOptions.map((option, index) => {
                const enabledLanguages = [
                  'en-GB', 'zh-CN', 'zh-TW', 'ar-AR', 'fa-IR', 'tr-TR', 'uk-UA', 'zh-BO', 'sl-SI',
@@ -301,8 +307,7 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({ position = 'bottom-
                  />
                );
              })}
-            </div>
-          </ScrollArea>
+          </div>
        </Menu.Dropdown>
      </Menu>
    </>
@@ -216,14 +216,12 @@ export default function RightRail() {
            tooltipOffset
          )}

-          {renderWithTooltip(
-            <div style={{ display: 'inline-flex' }}>
-              <LanguageSelector position="left-start" offset={6} compact />
-            </div>,
-            t('rightRail.language', 'Language'),
-            tooltipPosition,
-            tooltipOffset
-          )}
+          <LanguageSelector
+            position="left-start"
+            offset={6}
+            compact
+            tooltip={t('rightRail.language', 'Language')}
+          />

          {renderWithTooltip(
            <ActionIcon
@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import { Text, Loader } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import { tempOcrLanguages, getAutoOcrLanguage } from '@app/utils/languageMapping';
+import { getAutoOcrLanguage, getBrowserLanguagesForOcr, getOcrDisplayName } from '@app/utils/languageMapping';
+import apiClient from '@app/services/apiClient';
 import DropdownListWithFooter, { DropdownItem } from '@app/components/shared/DropdownListWithFooter';

 export interface LanguageOption {
@@ -37,32 +38,41 @@ const LanguagePicker: React.FC<LanguagePickerProps> = ({
    // Fetch available languages from backend
    const fetchLanguages = async () => {
      try {
-        const response = await fetch(languagesEndpoint);
+        const { data } = await apiClient.get<{ languages: string[] }>(languagesEndpoint);

+        const displayNames = typeof Intl.DisplayNames !== 'undefined'
+          ? new Intl.DisplayNames([i18n.language], { type: 'language' })
+          : null;

-        if (response.ok) {
-          const data: { languages: string[] } = await response.json();
-          const languages = data.languages;
+        const languageOptions = [...new Set(data.languages)]
+          .map((lang) => {
+            const displayName = getOcrDisplayName(lang);
+            const browserLanguageCodes = getBrowserLanguagesForOcr(lang);

+            const langKey = `lang.${lang}`;
+            const translatedFromKey = t(langKey);
+            const hasKeyTranslation = translatedFromKey !== langKey;

-          const languageOptions = languages.map(lang => {
-            // TODO: Use actual language translations when they become available
-            // For now, use temporary English translations
-            const translatedName = tempOcrLanguages.lang[lang as keyof typeof tempOcrLanguages.lang] || lang;
-            const displayName = translatedName;
+            const intlTranslatedName = displayNames
+              ? browserLanguageCodes
+                  .map((code) => displayNames.of(code))
+                  .find((name): name is string => Boolean(name))
+              : null;
+
+            const translatedName =
+              (hasKeyTranslation ? translatedFromKey : null)
+              || intlTranslatedName
+              || t(`ocr.languages.${lang}`, displayName);

            return {
              value: lang,
-              name: displayName
+              name: translatedName,
+              label: translatedName
            };
-          });
+          })
+          .sort((a, b) => a.name.localeCompare(b.name, i18n.language));

-          setAvailableLanguages(languageOptions);
-        } else {
-          console.error('[LanguagePicker] Response not OK:', response.status, response.statusText);
-          const errorText = await response.text();
-          console.error('[LanguagePicker] Error response body:', errorText);
-        }
+        setAvailableLanguages(languageOptions);
      } catch (error) {
        console.error('[LanguagePicker] Fetch failed with error:', error);
        console.error('[LanguagePicker] Error details:', {
@@ -76,7 +86,7 @@ const LanguagePicker: React.FC<LanguagePickerProps> = ({
    };

    fetchLanguages();
-  }, [languagesEndpoint]);
+  }, [languagesEndpoint, i18n.language, t]);

  // Auto-fill OCR language based on browser language when languages are loaded
  useEffect(() => {
@@ -1,13 +1,15 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ActionIcon, Alert, Badge, Box, Card, Group, Stack, Text, TextInput, Tooltip } from '@mantine/core';
 import { LocalIcon } from '@app/components/shared/LocalIcon';
 import { MAX_SAVED_SIGNATURES, SavedSignature, SavedSignatureType } from '@app/hooks/tools/sign/useSavedSignatures';
+import type { StorageType } from '@app/services/signatureStorageService';

 interface SavedSignaturesSectionProps {
  signatures: SavedSignature[];
  disabled?: boolean;
  isAtCapacity: boolean;
+  storageType?: StorageType | null;
  onUseSignature: (signature: SavedSignature) => void;
  onDeleteSignature: (signature: SavedSignature) => void;
  onRenameSignature: (id: string, label: string) => void;
@@ -24,6 +26,7 @@ export const SavedSignaturesSection = ({
  signatures,
  disabled = false,
  isAtCapacity,
+  storageType: _storageType,
  onUseSignature,
  onDeleteSignature,
  onRenameSignature,
@@ -36,20 +39,30 @@ export const SavedSignaturesSection = ({
    [t, translationScope]
  );
  const [labelDrafts, setLabelDrafts] = useState<Record<string, string>>({});
-  const [activeIndex, setActiveIndex] = useState(0);
-  const activeSignature = signatures[activeIndex];
-  const activeSignatureRef = useRef<SavedSignature | null>(activeSignature ?? null);
-  const appliedSignatureIdRef = useRef<string | null>(null);
+
+  // Group signatures by scope
+  const groupedSignatures = useMemo(() => {
+    const personal = signatures.filter(sig => sig.scope === 'personal');
+    const shared = signatures.filter(sig => sig.scope === 'shared');
+    const localStorage = signatures.filter(sig => sig.scope === 'localStorage');
+    return { personal, shared, localStorage };
+  }, [signatures]);
+
+  // Separate carousel state for each category
+  const [activePersonalIndex, setActivePersonalIndex] = useState(0);
+  const [activeSharedIndex, setActiveSharedIndex] = useState(0);
+  const [activeLocalStorageIndex, setActiveLocalStorageIndex] = useState(0);
+
+  const activePersonalSignature = groupedSignatures.personal[activePersonalIndex];
+  const activeSharedSignature = groupedSignatures.shared[activeSharedIndex];
+  const activeLocalStorageSignature = groupedSignatures.localStorage[activeLocalStorageIndex];
+
  const onUseSignatureRef = useRef(onUseSignature);

  useEffect(() => {
    onUseSignatureRef.current = onUseSignature;
  }, [onUseSignature]);

-  useEffect(() => {
-    activeSignatureRef.current = activeSignature ?? null;
-  }, [activeSignature]);
-
  useEffect(() => {
    setLabelDrafts(prev => {
      const nextDrafts: Record<string, string> = {};
@@ -60,25 +73,18 @@ export const SavedSignaturesSection = ({
    });
  }, [signatures]);

+  // Reset carousel indices when categories change
  useEffect(() => {
-    if (signatures.length === 0) {
-      setActiveIndex(0);
-      return;
-    }
-    setActiveIndex(prev => Math.min(prev, Math.max(signatures.length - 1, 0)));
-  }, [signatures.length]);
+    setActivePersonalIndex(prev => Math.min(prev, Math.max(groupedSignatures.personal.length - 1, 0)));
+  }, [groupedSignatures.personal.length]);

-  const handleNavigate = useCallback(
-    (direction: 'prev' | 'next') => {
-      setActiveIndex(prev => {
-        if (direction === 'prev') {
-          return Math.max(0, prev - 1);
-        }
-        return Math.min(signatures.length - 1, prev + 1);
-      });
-    },
-    [signatures.length]
-  );
+  useEffect(() => {
+    setActiveSharedIndex(prev => Math.min(prev, Math.max(groupedSignatures.shared.length - 1, 0)));
+  }, [groupedSignatures.shared.length]);
+
+  useEffect(() => {
+    setActiveLocalStorageIndex(prev => Math.min(prev, Math.max(groupedSignatures.localStorage.length - 1, 0)));
+  }, [groupedSignatures.localStorage.length]);

  const renderPreview = (signature: SavedSignature) => {
    if (signature.type === 'text') {
@@ -193,21 +199,6 @@ export const SavedSignaturesSection = ({
    }
  };

-  useEffect(() => {
-    const signature = activeSignatureRef.current;
-    if (!signature || disabled) {
-      appliedSignatureIdRef.current = null;
-      return;
-    }
-
-    if (appliedSignatureIdRef.current === signature.id) {
-      return;
-    }
-
-    appliedSignatureIdRef.current = signature.id;
-    onUseSignatureRef.current(signature);
-  }, [activeSignature?.id, disabled]);
-
  return (
    <Stack gap="sm">
      <Group justify="space-between" align="flex-start">
@@ -234,67 +225,253 @@ export const SavedSignaturesSection = ({
      {signatures.length === 0 ? (
        emptyState
      ) : (
-        <Stack gap="xs">
-          <Group justify="space-between" align="center">
-            <Text size="sm" c="dimmed">
-              {translate('saved.carouselPosition', '{{current}} of {{total}}', {
-                current: activeIndex + 1,
-                total: signatures.length,
-              })}
-            </Text>
-            <Group gap={4}>
-              <ActionIcon
-                variant="light"
-                aria-label={translate('saved.prev', 'Previous')}
-                onClick={() => handleNavigate('prev')}
-                disabled={disabled || activeIndex === 0}
-              >
-                <LocalIcon icon="material-symbols:chevron-left-rounded" width={18} height={18} />
-              </ActionIcon>
-              <ActionIcon
-                variant="light"
-                aria-label={translate('saved.next', 'Next')}
-                onClick={() => handleNavigate('next')}
-                disabled={disabled || activeIndex >= signatures.length - 1}
-              >
-                <LocalIcon icon="material-symbols:chevron-right-rounded" width={18} height={18} />
-              </ActionIcon>
-            </Group>
-          </Group>
+        <Stack gap="md">
+          {/* Personal Signatures */}
+          {groupedSignatures.personal.length > 0 && activePersonalSignature && (
+            <Stack gap="xs">
+              <Group gap="xs">
+                <LocalIcon icon="material-symbols:person-rounded" width={18} height={18} />
+                <Text fw={600} size="sm">
+                  {translate('saved.personalHeading', 'Personal Signatures')}
+                </Text>
+              </Group>
+              <Text size="xs" c="dimmed">
+                {translate('saved.personalDescription', 'Only you can see these signatures.')}
+              </Text>

-          {activeSignature && (
-            <Card withBorder padding="sm" key={activeSignature.id}>
-              <Stack gap="sm">
-                <Group justify="space-between" align="center">
-                  <Badge color={typeBadgeColor[activeSignature.type]} variant="light">
-                    {typeLabel(activeSignature.type)}
-                  </Badge>
-                  <Tooltip label={translate('saved.delete', 'Remove')}>
-                    <ActionIcon
-                      variant="subtle"
-                      color="red"
-                      aria-label={translate('saved.delete', 'Remove')}
-                      onClick={() => onDeleteSignature(activeSignature)}
-                      disabled={disabled}
-                    >
-                      <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
-                    </ActionIcon>
-                  </Tooltip>
+              <Group justify="space-between" align="center">
+                <Text size="sm" c="dimmed">
+                  {translate('saved.carouselPosition', '{{current}} of {{total}}', {
+                    current: activePersonalIndex + 1,
+                    total: groupedSignatures.personal.length,
+                  })}
+                </Text>
+                <Group gap={4}>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.prev', 'Previous')}
+                    onClick={() => setActivePersonalIndex(prev => Math.max(0, prev - 1))}
+                    disabled={disabled || activePersonalIndex === 0}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-left-rounded" width={18} height={18} />
+                  </ActionIcon>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.next', 'Next')}
+                    onClick={() => setActivePersonalIndex(prev => Math.min(groupedSignatures.personal.length - 1, prev + 1))}
+                    disabled={disabled || activePersonalIndex >= groupedSignatures.personal.length - 1}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-right-rounded" width={18} height={18} />
+                  </ActionIcon>
                </Group>
+              </Group>

-                {renderPreview(activeSignature)}
+              <Card withBorder padding="sm">
+                <Stack gap="sm">
+                  <Group justify="space-between" align="center">
+                    <Badge color={typeBadgeColor[activePersonalSignature.type]} variant="light">
+                      {typeLabel(activePersonalSignature.type)}
+                    </Badge>
+                    <Group gap="xs">
+                      <ActionIcon
+                        variant="subtle"
+                        color="blue"
+                        aria-label="Use signature"
+                        onClick={() => onUseSignature(activePersonalSignature)}
+                        disabled={disabled}
+                      >
+                        <LocalIcon icon="material-symbols:check-circle-outline-rounded" width={18} height={18} />
+                      </ActionIcon>
+                      <Tooltip label={translate('saved.delete', 'Remove')}>
+                        <ActionIcon
+                          variant="subtle"
+                          color="red"
+                          aria-label={translate('saved.delete', 'Remove')}
+                          onClick={() => onDeleteSignature(activePersonalSignature)}
+                          disabled={disabled}
+                        >
+                          <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
+                        </ActionIcon>
+                      </Tooltip>
+                    </Group>
+                  </Group>
+                  {renderPreview(activePersonalSignature)}
+                  <TextInput
+                    label={translate('saved.label', 'Label')}
+                    value={labelDrafts[activePersonalSignature.id] ?? activePersonalSignature.label}
+                    onChange={event => handleLabelChange(event, activePersonalSignature)}
+                    onBlur={() => handleLabelBlur(activePersonalSignature)}
+                    onKeyDown={event => handleLabelKeyDown(event, activePersonalSignature)}
+                    disabled={disabled}
+                  />
+                </Stack>
+              </Card>
+            </Stack>
+          )}

-                <TextInput
-                  label={translate('saved.label', 'Label')}
-                  value={labelDrafts[activeSignature.id] ?? activeSignature.label}
-                  onChange={event => handleLabelChange(event, activeSignature)}
-                  onBlur={() => handleLabelBlur(activeSignature)}
-                  onKeyDown={event => handleLabelKeyDown(event, activeSignature)}
-                  disabled={disabled}
-                />
+          {/* Shared Signatures */}
+          {groupedSignatures.shared.length > 0 && activeSharedSignature && (
+            <Stack gap="xs">
+              <Group gap="xs">
+                <LocalIcon icon="material-symbols:groups-rounded" width={18} height={18} />
+                <Text fw={600} size="sm">
+                  {translate('saved.sharedHeading', 'Shared Signatures')}
+                </Text>
+              </Group>
+              <Text size="xs" c="dimmed">
+                {translate('saved.sharedDescription', 'All users can see and use these signatures.')}
+              </Text>

-              </Stack>
-            </Card>
+              <Group justify="space-between" align="center">
+                <Text size="sm" c="dimmed">
+                  {translate('saved.carouselPosition', '{{current}} of {{total}}', {
+                    current: activeSharedIndex + 1,
+                    total: groupedSignatures.shared.length,
+                  })}
+                </Text>
+                <Group gap={4}>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.prev', 'Previous')}
+                    onClick={() => setActiveSharedIndex(prev => Math.max(0, prev - 1))}
+                    disabled={disabled || activeSharedIndex === 0}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-left-rounded" width={18} height={18} />
+                  </ActionIcon>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.next', 'Next')}
+                    onClick={() => setActiveSharedIndex(prev => Math.min(groupedSignatures.shared.length - 1, prev + 1))}
+                    disabled={disabled || activeSharedIndex >= groupedSignatures.shared.length - 1}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-right-rounded" width={18} height={18} />
+                  </ActionIcon>
+                </Group>
+              </Group>
+
+              <Card withBorder padding="sm">
+                <Stack gap="sm">
+                  <Group justify="space-between" align="center">
+                    <Badge color={typeBadgeColor[activeSharedSignature.type]} variant="light">
+                      {typeLabel(activeSharedSignature.type)}
+                    </Badge>
+                    <Group gap="xs">
+                      <ActionIcon
+                        variant="subtle"
+                        color="blue"
+                        aria-label="Use signature"
+                        onClick={() => onUseSignature(activeSharedSignature)}
+                        disabled={disabled}
+                      >
+                        <LocalIcon icon="material-symbols:check-circle-outline-rounded" width={18} height={18} />
+                      </ActionIcon>
+                      <Tooltip label={translate('saved.delete', 'Remove')}>
+                        <ActionIcon
+                          variant="subtle"
+                          color="red"
+                          aria-label={translate('saved.delete', 'Remove')}
+                          onClick={() => onDeleteSignature(activeSharedSignature)}
+                          disabled={disabled}
+                        >
+                          <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
+                        </ActionIcon>
+                      </Tooltip>
+                    </Group>
+                  </Group>
+                  {renderPreview(activeSharedSignature)}
+                  <TextInput
+                    label={translate('saved.label', 'Label')}
+                    value={labelDrafts[activeSharedSignature.id] ?? activeSharedSignature.label}
+                    onChange={event => handleLabelChange(event, activeSharedSignature)}
+                    onBlur={() => handleLabelBlur(activeSharedSignature)}
+                    onKeyDown={event => handleLabelKeyDown(event, activeSharedSignature)}
+                    disabled={disabled}
+                  />
+                </Stack>
+              </Card>
+            </Stack>
+          )}
+
+          {/* Browser Storage (localStorage) - Temporary */}
+          {groupedSignatures.localStorage.length > 0 && activeLocalStorageSignature && (
+            <Stack gap="xs">
+              <Alert color="blue" title={translate('saved.tempStorageTitle', 'Temporary browser storage')}>
+                <Text size="xs">
+                  {translate(
+                    'saved.tempStorageDescription',
+                    'Signatures are stored in your browser only. They will be lost if you clear browser data or switch browsers.'
+                  )}
+                </Text>
+              </Alert>
+
+              <Group justify="space-between" align="center">
+                <Text size="sm" c="dimmed">
+                  {translate('saved.carouselPosition', '{{current}} of {{total}}', {
+                    current: activeLocalStorageIndex + 1,
+                    total: groupedSignatures.localStorage.length,
+                  })}
+                </Text>
+                <Group gap={4}>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.prev', 'Previous')}
+                    onClick={() => setActiveLocalStorageIndex(prev => Math.max(0, prev - 1))}
+                    disabled={disabled || activeLocalStorageIndex === 0}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-left-rounded" width={18} height={18} />
+                  </ActionIcon>
+                  <ActionIcon
+                    variant="light"
+                    aria-label={translate('saved.next', 'Next')}
+                    onClick={() => setActiveLocalStorageIndex(prev => Math.min(groupedSignatures.localStorage.length - 1, prev + 1))}
+                    disabled={disabled || activeLocalStorageIndex >= groupedSignatures.localStorage.length - 1}
+                  >
+                    <LocalIcon icon="material-symbols:chevron-right-rounded" width={18} height={18} />
+                  </ActionIcon>
+                </Group>
+              </Group>
+
+              <Card withBorder padding="sm">
+                <Stack gap="sm">
+                  <Group justify="space-between" align="center">
+                    <Badge color={typeBadgeColor[activeLocalStorageSignature.type]} variant="light">
+                      {typeLabel(activeLocalStorageSignature.type)}
+                    </Badge>
+                    <Group gap="xs">
+                      <ActionIcon
+                        variant="subtle"
+                        color="blue"
+                        aria-label="Use signature"
+                        onClick={() => onUseSignature(activeLocalStorageSignature)}
+                        disabled={disabled}
+                      >
+                        <LocalIcon icon="material-symbols:check-circle-outline-rounded" width={18} height={18} />
+                      </ActionIcon>
+                      <Tooltip label={translate('saved.delete', 'Remove')}>
+                        <ActionIcon
+                          variant="subtle"
+                          color="red"
+                          aria-label={translate('saved.delete', 'Remove')}
+                          onClick={() => onDeleteSignature(activeLocalStorageSignature)}
+                          disabled={disabled}
+                        >
+                          <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
+                        </ActionIcon>
+                      </Tooltip>
+                    </Group>
+                  </Group>
+                  {renderPreview(activeLocalStorageSignature)}
+                  <TextInput
+                    label={translate('saved.label', 'Label')}
+                    value={labelDrafts[activeLocalStorageSignature.id] ?? activeLocalStorageSignature.label}
+                    onChange={event => handleLabelChange(event, activeLocalStorageSignature)}
+                    onBlur={() => handleLabelBlur(activeLocalStorageSignature)}
+                    onKeyDown={event => handleLabelKeyDown(event, activeLocalStorageSignature)}
+                    disabled={disabled}
+                  />
+                </Stack>
+              </Card>
+            </Stack>
          )}
        </Stack>
      )}
@@ -16,6 +16,7 @@ import { ColorPicker } from "@app/components/annotation/shared/ColorPicker";
 import { LocalIcon } from "@app/components/shared/LocalIcon";
 import { useSavedSignatures, SavedSignature, SavedSignaturePayload, SavedSignatureType, MAX_SAVED_SIGNATURES, AddSignatureResult } from '@app/hooks/tools/sign/useSavedSignatures';
 import { SavedSignaturesSection } from '@app/components/tools/sign/SavedSignaturesSection';
+import { buildSignaturePreview } from '@app/utils/signaturePreview';

 type SignatureDrafts = {
  canvas?: string;
@@ -99,6 +100,7 @@ const SignSettings = ({
    removeSignature,
    updateSignatureLabel,
    byTypeCounts,
+    storageType,
  } = useSavedSignatures();
  const [signatureSource, setSignatureSource] = useState<SignatureSource>(() => {
    const paramSource = parameters.signatureType as SignatureSource;
@@ -157,11 +159,11 @@ const SignSettings = ({
  }, [canvasSignatureData, imageSignatureData, buildTextSignatureKey, parameters.signerName, parameters.fontSize, parameters.fontFamily, parameters.textColor]);

  const saveSignatureToLibrary = useCallback(
-    (payload: SavedSignaturePayload, type: SavedSignatureType): AddSignatureResult => {
+    async (payload: SavedSignaturePayload, type: SavedSignatureType, scope: 'personal' | 'shared'): Promise<AddSignatureResult> => {
      if (isSavedSignatureLimitReached) {
        return { success: false, reason: 'limit' };
      }
-      return addSignature(payload, getDefaultSavedLabel(type));
+      return await addSignature(payload, getDefaultSavedLabel(type), scope);
    },
    [addSignature, getDefaultSavedLabel, isSavedSignatureLimitReached]
  );
@@ -176,40 +178,57 @@ const SignSettings = ({
    [signatureKeysByType]
  );

-  const handleSaveCanvasSignature = useCallback(() => {
+  const handleSaveCanvasSignature = useCallback(async (scope: 'personal' | 'shared') => {
    if (!canvasSignatureData) {
      return;
    }
-    const result = saveSignatureToLibrary({ type: 'canvas', dataUrl: canvasSignatureData }, 'canvas');
+    const result = await saveSignatureToLibrary({ type: 'canvas', dataUrl: canvasSignatureData }, 'canvas', scope);
    if (result.success) {
      setLastSavedKeyForType('canvas');
    }
  }, [canvasSignatureData, saveSignatureToLibrary, setLastSavedKeyForType]);

-  const handleSaveImageSignature = useCallback(() => {
+  const handleSaveImageSignature = useCallback(async (scope: 'personal' | 'shared') => {
    if (!imageSignatureData) {
      return;
    }
-    const result = saveSignatureToLibrary({ type: 'image', dataUrl: imageSignatureData }, 'image');
+    const result = await saveSignatureToLibrary({ type: 'image', dataUrl: imageSignatureData }, 'image', scope);
    if (result.success) {
      setLastSavedKeyForType('image');
    }
  }, [imageSignatureData, saveSignatureToLibrary, setLastSavedKeyForType]);

-  const handleSaveTextSignature = useCallback(() => {
+  const handleSaveTextSignature = useCallback(async (scope: 'personal' | 'shared') => {
    const signerName = (parameters.signerName ?? '').trim();
    if (!signerName) {
      return;
    }
-    const result = saveSignatureToLibrary(
+
+    // Generate image from text signature
+    const preview = await buildSignaturePreview({
+      signatureType: 'text',
+      signerName,
+      fontFamily: parameters.fontFamily ?? 'Helvetica',
+      fontSize: parameters.fontSize ?? 16,
+      textColor: parameters.textColor ?? '#000000',
+    });
+
+    if (!preview?.dataUrl) {
+      console.error('Failed to generate text signature preview');
+      return;
+    }
+
+    const result = await saveSignatureToLibrary(
      {
        type: 'text',
+        dataUrl: preview.dataUrl,
        signerName,
        fontFamily: parameters.fontFamily ?? 'Helvetica',
        fontSize: parameters.fontSize ?? 16,
        textColor: parameters.textColor ?? '#000000',
      },
-      'text'
+      'text',
+      scope
    );
    if (result.success) {
      setLastSavedKeyForType('text');
@@ -286,16 +305,21 @@ const SignSettings = ({
    [updateSignatureLabel]
  );

-  const renderSaveButton = (type: SavedSignatureType, isReady: boolean, onClick: () => void) => {
+  const renderSaveButton = (type: SavedSignatureType, isReady: boolean, onClick: (scope: 'personal' | 'shared') => void, scope: 'personal' | 'shared', icon: string, label: string) => {
    if (!canUseSavedLibrary) {
      return null;
    }
-    const label = translate('saved.saveButton', 'Save signature');
    const currentKey = signatureKeysByType[type];
    const lastSavedKey = lastSavedSignatureKeys[type];
    const hasChanges = Boolean(currentKey && currentKey !== lastSavedKey);
    const isSaved = isReady && !hasChanges;

+    // Only show backend storage buttons when backend is available
+    const showButton = storageType === 'backend' || storageType === null;
+    if (!showButton) {
+      return null;
+    }
+
    let tooltipMessage: string | undefined;
    if (!isReady) {
      tooltipMessage = translate('saved.saveUnavailable', 'Create a signature first to save it.');
@@ -312,11 +336,11 @@ const SignSettings = ({
        size="xs"
        variant="outline"
        color={isSaved ? 'green' : undefined}
-        onClick={onClick}
+        onClick={() => onClick(scope)}
        disabled={!isReady || disabled || isSavedSignatureLimitReached || !hasChanges}
-        leftSection={<LocalIcon icon="material-symbols:save-rounded" width={16} height={16} />}
+        leftSection={<LocalIcon icon={icon} width={16} height={16} />}
      >
-        {isSaved ? translate('saved.status.saved', 'Saved') : label}
+        {label}
      </Button>
    );

@@ -331,15 +355,38 @@ const SignSettings = ({
    return button;
  };

-  const renderSaveButtonRow = (type: SavedSignatureType, isReady: boolean, onClick: () => void) => {
-    const button = renderSaveButton(type, isReady, onClick);
-    if (!button) {
+  const renderSaveButtonRow = (type: SavedSignatureType, isReady: boolean, onClick: (scope: 'personal' | 'shared') => void) => {
+    if (!canUseSavedLibrary) {
      return null;
    }
+
+    const personalButton = renderSaveButton(
+      type,
+      isReady,
+      onClick,
+      'personal',
+      'material-symbols:person-rounded',
+      translate('saved.savePersonal', 'Save Personal')
+    );
+
+    const sharedButton = renderSaveButton(
+      type,
+      isReady,
+      onClick,
+      'shared',
+      'material-symbols:groups-rounded',
+      translate('saved.saveShared', 'Save Shared')
+    );
+
+    if (!personalButton && !sharedButton) {
+      return null;
+    }
+
    return (
-      <Box style={{ alignSelf: 'flex-start', marginTop: '0.4rem' }}>
-        {button}
-      </Box>
+      <Group gap="xs" style={{ alignSelf: 'flex-start', marginTop: '0.4rem' }}>
+        {personalButton}
+        {sharedButton}
+      </Group>
    );
  };

@@ -744,6 +791,7 @@ const SignSettings = ({
          signatures={savedSignatures}
          disabled={disabled}
          isAtCapacity={isSavedSignatureLimitReached}
+          storageType={storageType}
          onUseSignature={handleUseSavedSignature}
          onDeleteSignature={handleDeleteSavedSignature}
          onRenameSignature={handleRenameSavedSignature}
@@ -0,0 +1,244 @@
+import React, { useEffect, useState, useMemo, useCallback } from 'react';
+import { useAnnotationCapability } from '@embedpdf/plugin-annotation/react';
+import { useScroll } from '@embedpdf/plugin-scroll/react';
+
+enum PDFActionType {
+  GoTo = 0,
+  GoToR = 1,
+  GoToE = 2,
+  URI = 3,
+  // Add other types as needed
+}
+
+interface PDFRect {
+  origin: { x: number; y: number };
+  size: { width: number; height: number };
+}
+
+interface PDFDestination {
+  pageIndex: number;
+  view: [number, number];
+}
+
+interface PDFAction {
+  type: string | number;
+  destination?: PDFDestination;
+  uri?: string;
+}
+
+interface LinkAnnotation {
+  id: string;
+  type: number;
+  rect: PDFRect;
+  target?: {
+    type: string;
+    action?: PDFAction;
+    destination?: PDFDestination;
+    uri?: string;
+  };
+}
+
+function isGoToAction(action: PDFAction): boolean {
+  return action.type === 'GoTo' || action.type === PDFActionType.GoTo;
+}
+
+function isURIAction(action: PDFAction): boolean {
+  return action.type === 'URI' || action.type === PDFActionType.URI;
+}
+
+function isInternalLink(link: LinkAnnotation): boolean {
+  return Boolean(link.target?.type === 'destination' ||
+         (link.target?.type === 'action' && link.target.action && isGoToAction(link.target.action)));
+}
+
+function isExternalLink(link: LinkAnnotation): boolean {
+  return Boolean(link.target?.type === 'uri' ||
+         (link.target?.type === 'action' && link.target.action && isURIAction(link.target.action)));
+}
+
+interface LinkLayerProps {
+  pageIndex: number;
+  scale: number;
+  document?: any;
+  pdfFile?: File | Blob;
+  onLinkClick?: (target: any) => void;
+}
+
+const getLinkTitle = (link: LinkAnnotation): string => {
+  if (link.target?.type === 'destination') {
+    return `Go to page ${(link.target.destination?.pageIndex ?? 0) + 1}`;
+  }
+  if (link.target?.type === 'action' && link.target.action?.type === 'GoTo') {
+    return `Go to page ${(link.target.action.destination?.pageIndex ?? 0) + 1}`;
+  }
+  if (link.target?.type === 'action' && (link.target.action?.type === 'URI' || link.target.action?.type === 3)) {
+    return `Open link: ${link.target.action.uri}`;
+  }
+  if (link.target?.uri) {
+    return `Open link: ${link.target.uri}`;
+  }
+  return 'Link';
+};
+
+const getLinkAriaLabel = (link: LinkAnnotation): string => {
+  if (link.target?.type === 'destination') {
+    return `Navigate to page ${(link.target.destination?.pageIndex ?? 0) + 1}`;
+  }
+  if (link.target?.type === 'action' && link.target.action?.type === 'GoTo') {
+    return `Navigate to page ${(link.target.action.destination?.pageIndex ?? 0) + 1}`;
+  }
+  if (link.target?.type === 'action' && (link.target.action?.type === 'URI' || link.target.action?.type === 3)) {
+    return 'Open external link';
+  }
+  return 'Open external link';
+};
+
+export const LinkLayer: React.FC<LinkLayerProps> = ({
+  pageIndex,
+  scale,
+  document: pdfDocument,
+  onLinkClick
+}) => {
+  const { provides: annotation } = useAnnotationCapability();
+  const { provides: scroll } = useScroll();
+  const [links, setLinks] = useState<LinkAnnotation[]>([]);
+  const [isNavigating, setIsNavigating] = useState(false);
+
+  const processedLinks = useMemo(() => {
+    return links.map(link => ({
+      ...link,
+      scaledRect: {
+        left: link.rect.origin.x * scale,
+        top: link.rect.origin.y * scale,
+        width: link.rect.size.width * scale,
+        height: link.rect.size.height * scale,
+      }
+    }));
+  }, [links, scale]);
+
+  useEffect(() => {
+    const fetchLinks = async () => {
+      if (!annotation) return;
+
+      try {
+        // Use the annotation API's built-in filtering if available
+        const pageAnnotations = await annotation
+          .getPageAnnotations({
+            pageIndex,
+            // Try to filter for link annotations (type 2) if the API supports it
+            ...(annotation.getPageAnnotations.length > 1 ? { types: [2] } : {})
+          })
+          .toPromise();
+
+        // Filter for link annotations (type 2 is LINK in PDF spec) as fallback
+        const linkAnnotations = pageAnnotations.filter(
+          (ann: any) => ann.type === 2
+        ) as LinkAnnotation[];
+
+        if (linkAnnotations.length > 0) {
+          setLinks(linkAnnotations);
+          return;
+        }
+      } catch (error) {
+        console.error('[LinkLayer] Failed to fetch links from annotation API:', error);
+      }
+
+      if (pdfDocument) {
+        try {
+          // Try different methods to get link annotations
+          let pdfLinks: any[] = [];
+
+          if (pdfDocument.getPageAnnotations && typeof pdfDocument.getPageAnnotations === 'function') {
+            pdfLinks = await pdfDocument.getPageAnnotations(pageIndex);
+          } else if (pdfDocument.getAnnotations && typeof pdfDocument.getAnnotations === 'function') {
+            const allAnnotations = await pdfDocument.getAnnotations();
+            pdfLinks = allAnnotations.filter((ann: any) => ann.pageIndex === pageIndex && ann.type === 2);
+          } else if (pdfDocument.pages && pdfDocument.pages[pageIndex]) {
+            const page = pdfDocument.pages[pageIndex];
+            if (page.getAnnotations && typeof page.getAnnotations === 'function') {
+              pdfLinks = await page.getAnnotations();
+            }
+          }
+
+          const convertedLinks = pdfLinks.map((ann: any) => ({
+            id: ann.id || `pdf-link-${pageIndex}-${Math.random()}`,
+            type: ann.type || 2,
+            rect: ann.rect || ann,
+            target: ann.target || ann.action
+          })) as LinkAnnotation[];
+
+          setLinks(convertedLinks);
+        } catch (error) {
+          console.warn('[LinkLayer] Failed to get annotations from PDF document:', error);
+        }
+      } else {
+        console.warn('[LinkLayer] No annotation API or PDF document available');
+      }
+    };
+
+    fetchLinks();
+  }, [annotation, pageIndex, pdfDocument]);
+
+  const handleLinkClick = useCallback(async (link: LinkAnnotation) => {
+    if (isNavigating) return; // Prevent multiple simultaneous navigations
+
+    try {
+      setIsNavigating(true);
+
+      if (onLinkClick) {
+        onLinkClick(link.target);
+        return;
+      }
+
+      if (isInternalLink(link)) {
+        const targetPage = link.target?.destination?.pageIndex ??
+                          link.target?.action?.destination?.pageIndex;
+        if (targetPage !== undefined && scroll) {
+          await scroll.scrollToPage({
+            pageNumber: targetPage + 1, // PDF pages are 1-indexed
+            behavior: 'smooth',
+          });
+        }
+      } else if (isExternalLink(link)) {
+        const uri = link.target?.uri ?? link.target?.action?.uri;
+        if (uri) {
+          window.open(uri, '_blank', 'noopener,noreferrer');
+        }
+      } else {
+        throw new Error(`Unsupported link type: ${link.target?.type}`);
+      }
+    } catch (error) {
+      console.error('[LinkLayer] Navigation failed:', error);
+    } finally {
+      setIsNavigating(false);
+    }
+  }, [isNavigating, onLinkClick, scroll]);
+
+  return (
+    <div className="absolute inset-0 pointer-events-none">
+      {processedLinks.map((link) => {
+        const { id } = link;
+        const { left, top, width, height } = link.scaledRect;
+
+        return (
+          <button
+            key={id}
+            onClick={() => handleLinkClick(link)}
+            disabled={isNavigating}
+            className={`absolute opacity-0 hover:opacity-20 bg-blue-500 transition-opacity cursor-pointer pointer-events-auto border border-blue-400 hover:border-blue-600 ${isNavigating ? 'cursor-not-allowed opacity-50' : ''}`}
+            style={{
+              left: `${left}px`,
+              top: `${top}px`,
+              width: `${width}px`,
+              height: `${height}px`,
+              minWidth: '8px',
+              minHeight: '8px',
+            }}
+            title={getLinkTitle(link)}
+            aria-label={getLinkAriaLabel(link)}
+          />
+        );
+      })}
+    </div>
+  );
+};
@@ -43,6 +43,7 @@ import { ExportAPIBridge } from '@app/components/viewer/ExportAPIBridge';
 import { BookmarkAPIBridge } from '@app/components/viewer/BookmarkAPIBridge';
 import { isPdfFile } from '@app/utils/fileUtils';
 import { useTranslation } from 'react-i18next';
+import { LinkLayer } from '@app/components/viewer/LinkLayer';

 interface LocalEmbedPDFProps {
  file?: File | Blob;
@@ -103,15 +104,17 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
      createPluginRegistration(SelectionPluginPackage),

      // Register history plugin for undo/redo (recommended for annotations)
-      ...(enableAnnotations ? [createPluginRegistration(HistoryPluginPackage)] : []),
+      // Always register for reading existing annotations
+      createPluginRegistration(HistoryPluginPackage),

      // Register annotation plugin (depends on InteractionManager, Selection, History)
-      ...(enableAnnotations ? [createPluginRegistration(AnnotationPluginPackage, {
+      // Always register for reading existing annotations like links
+      createPluginRegistration(AnnotationPluginPackage, {
        annotationAuthor: 'Digital Signature',
        autoCommit: true,
        deactivateToolAfterCreate: false,
        selectAfterCreate: true,
-      })] : []),
+      }),

      // Register pan plugin (depends on Viewport, InteractionManager)
      createPluginRegistration(PanPluginPackage, {
@@ -229,68 +232,62 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
      <EmbedPDF
        engine={engine}
        plugins={plugins}
-        onInitialized={enableAnnotations ? async (registry) => {
+        onInitialized={async (registry) => {
          const annotationPlugin = registry.getPlugin('annotation');
          if (!annotationPlugin || !annotationPlugin.provides) return;

          const annotationApi = annotationPlugin.provides();
          if (!annotationApi) return;

-          // Add custom signature stamp tool for image signatures
-          annotationApi.addTool({
-            id: 'signatureStamp',
-            name: 'Digital Signature',
-            interaction: { exclusive: false, cursor: 'copy' },
-            matchScore: () => 0,
-            defaults: {
-              type: PdfAnnotationSubtype.STAMP,
-              // Image will be set dynamically when signature is created
-            },
-          });
+          if (enableAnnotations) {
+            annotationApi.addTool({
+              id: 'signatureStamp',
+              name: 'Digital Signature',
+              interaction: { exclusive: false, cursor: 'copy' },
+              matchScore: () => 0,
+              defaults: {
+                type: PdfAnnotationSubtype.STAMP,
+              },
+            });

-          // Add custom ink signature tool for drawn signatures
-          annotationApi.addTool({
-            id: 'signatureInk',
-            name: 'Signature Draw',
-            interaction: { exclusive: true, cursor: 'crosshair' },
-            matchScore: () => 0,
-            defaults: {
-              type: PdfAnnotationSubtype.INK,
-              color: '#000000',
-              opacity: 1.0,
-              borderWidth: 2,
-            },
-          });
+            annotationApi.addTool({
+              id: 'signatureInk',
+              name: 'Signature Draw',
+              interaction: { exclusive: true, cursor: 'crosshair' },
+              matchScore: () => 0,
+              defaults: {
+                type: PdfAnnotationSubtype.INK,
+                color: '#000000',
+                opacity: 1.0,
+                borderWidth: 2,
+              },
+            });

-          // Listen for annotation events to track annotations and notify parent
-          annotationApi.onAnnotationEvent((event: any) => {
-            if (event.type === 'create' && event.committed) {
-              // Add to annotations list
-              setAnnotations(prev => [...prev, {
-                id: event.annotation.id,
-                pageIndex: event.pageIndex,
-                rect: event.annotation.rect
-              }]);
+            annotationApi.onAnnotationEvent((event: any) => {
+              if (event.type === 'create' && event.committed) {
+                setAnnotations(prev => [...prev, {
+                  id: event.annotation.id,
+                  pageIndex: event.pageIndex,
+                  rect: event.annotation.rect
+                }]);


-              // Notify parent if callback provided
-              if (onSignatureAdded) {
-                onSignatureAdded(event.annotation);
+                if (onSignatureAdded) {
+                  onSignatureAdded(event.annotation);
+                }
+              } else if (event.type === 'delete' && event.committed) {
+                setAnnotations(prev => prev.filter(ann => ann.id !== event.annotation.id));
+              } else if (event.type === 'loaded') {
+                const loadedAnnotations = event.annotations || [];
+                setAnnotations(loadedAnnotations.map((ann: any) => ({
+                  id: ann.id,
+                  pageIndex: ann.pageIndex || 0,
+                  rect: ann.rect
+                })));
              }
-            } else if (event.type === 'delete' && event.committed) {
-              // Remove from annotations list
-              setAnnotations(prev => prev.filter(ann => ann.id !== event.annotation.id));
-            } else if (event.type === 'loaded') {
-              // Handle initial load of annotations
-              const loadedAnnotations = event.annotations || [];
-              setAnnotations(loadedAnnotations.map((ann: any) => ({
-                id: ann.id,
-                pageIndex: ann.pageIndex || 0,
-                rect: ann.rect
-              })));
-            }
-          });
-        } : undefined}
+            });
+          }
+        }}
      >
        <ZoomAPIBridge />
        <ScrollAPIBridge />
@@ -352,6 +349,10 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur

                      {/* Selection layer for text interaction */}
                      <SelectionLayer pageIndex={pageIndex} scale={scale} />
+
+                      {/* Link layer for clickable PDF links */}
+                      <LinkLayer pageIndex={pageIndex} scale={scale} document={document} pdfFile={file} />
+
                      {/* Annotation layer for signatures (only when enabled) */}
                      {enableAnnotations && (
                        <AnnotationLayer
@@ -122,7 +122,7 @@ const createTextStampImage = (

 export const SignatureAPIBridge = forwardRef<SignatureAPI>(function SignatureAPIBridge(_, ref) {
  const { provides: annotationApi } = useAnnotationCapability();
-  const { signatureConfig, storeImageData, isPlacementMode, placementPreviewSize } = useSignature();
+  const { signatureConfig, storeImageData, isPlacementMode, placementPreviewSize, setSignaturesApplied } = useSignature();
  const { getZoomState, registerImmediateZoomUpdate } = useViewer();
  const [currentZoom, setCurrentZoom] = useState(() => getZoomState()?.currentZoom ?? 1);
  const lastStampImageRef = useRef<string | null>(null);
@@ -389,6 +389,11 @@ export const SignatureAPIBridge = forwardRef<SignatureAPI>(function SignatureAPI
        return;
      }

+      // Mark signatures as not applied when a new signature is placed
+      if (event.type === 'create') {
+        setSignaturesApplied(false);
+      }
+
      const directData =
        extractDataUrl(annotation.imageSrc) ||
        extractDataUrl(annotation.imageData) ||
@@ -408,7 +413,7 @@ export const SignatureAPIBridge = forwardRef<SignatureAPI>(function SignatureAPI
    return () => {
      unsubscribe?.();
    };
-  }, [annotationApi, storeImageData]);
+  }, [annotationApi, storeImageData, setSignaturesApplied]);

  useEffect(() => {
    if (!isPlacementMode) {
@@ -443,6 +448,11 @@ export const SignatureAPIBridge = forwardRef<SignatureAPI>(function SignatureAPI
        return;
      }

+      // Mark signatures as not applied when a new signature is placed
+      if (event.type === 'create') {
+        setSignaturesApplied(false);
+      }
+
      const directData =
        extractDataUrl(annotation.imageSrc) ||
        extractDataUrl(annotation.imageData) ||
@@ -462,7 +472,7 @@ export const SignatureAPIBridge = forwardRef<SignatureAPI>(function SignatureAPI
    return () => {
      unsubscribe?.();
    };
-  }, [annotationApi, storeImageData]);
+  }, [annotationApi, storeImageData, setSignaturesApplied]);

  useEffect(() => {
    if (!isPlacementMode) {
@@ -74,8 +74,6 @@ export const SignatureProvider: React.FC<{ children: ReactNode }> = ({ children
    if (signatureApiRef.current) {
      signatureApiRef.current.activateDrawMode();
      setPlacementMode(true);
-      // Mark signatures as not applied when entering draw mode
-      setState(prev => ({ ...prev, signaturesApplied: false }));
    }
  }, [setPlacementMode]);

@@ -90,8 +88,6 @@ export const SignatureProvider: React.FC<{ children: ReactNode }> = ({ children
    if (signatureApiRef.current) {
      signatureApiRef.current.activateSignaturePlacementMode();
      setPlacementMode(true);
-      // Mark signatures as not applied when placing new signatures
-      setState(prev => ({ ...prev, signaturesApplied: false }));
    }
  }, [setPlacementMode]);

@@ -1,9 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import { signatureStorageService, type StorageType } from '@app/services/signatureStorageService';

-const STORAGE_KEY = 'stirling:saved-signatures:v1';
 export const MAX_SAVED_SIGNATURES = 10;

 export type SavedSignatureType = 'canvas' | 'image' | 'text';
+export type SignatureScope = 'personal' | 'shared' | 'localStorage';

 export type SavedSignaturePayload =
  | {
@@ -16,6 +17,7 @@ export type SavedSignaturePayload =
    }
  | {
      type: 'text';
+      dataUrl: string;
      signerName: string;
      fontFamily: string;
      fontSize: number;
@@ -25,6 +27,7 @@ export type SavedSignaturePayload =
 export type SavedSignature = SavedSignaturePayload & {
  id: string;
  label: string;
+  scope: SignatureScope;
  createdAt: number;
  updatedAt: number;
 };
@@ -35,68 +38,6 @@ export type AddSignatureResult =

 const isSupportedEnvironment = () => typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';

-const safeParse = (raw: string | null): SavedSignature[] => {
-  if (!raw) {
-    return [];
-  }
-
-  try {
-    const parsed = JSON.parse(raw);
-    if (!Array.isArray(parsed)) {
-      return [];
-    }
-
-    return parsed.filter((entry: any): entry is SavedSignature => {
-      if (!entry || typeof entry !== 'object') {
-        return false;
-      }
-      if (typeof entry.id !== 'string' || typeof entry.label !== 'string') {
-        return false;
-      }
-      if (typeof entry.type !== 'string') {
-        return false;
-      }
-
-      if (entry.type === 'text') {
-        return (
-          typeof entry.signerName === 'string' &&
-          typeof entry.fontFamily === 'string' &&
-          typeof entry.fontSize === 'number' &&
-          typeof entry.textColor === 'string'
-        );
-      }
-
-      return typeof entry.dataUrl === 'string';
-    });
-  } catch {
-    return [];
-  }
-};
-
-const readFromStorage = (): SavedSignature[] => {
-  if (!isSupportedEnvironment()) {
-    return [];
-  }
-
-  try {
-    return safeParse(window.localStorage.getItem(STORAGE_KEY));
-  } catch {
-    return [];
-  }
-};
-
-const writeToStorage = (entries: SavedSignature[]) => {
-  if (!isSupportedEnvironment()) {
-    return;
-  }
-
-  try {
-    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(entries));
-  } catch {
-    // Swallow storage errors silently; we still keep state in memory.
-  }
-};
-
 const generateId = () => {
  if (typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function') {
    return crypto.randomUUID();
@@ -105,29 +46,61 @@ const generateId = () => {
 };

 export const useSavedSignatures = () => {
-  const [savedSignatures, setSavedSignatures] = useState<SavedSignature[]>(() => readFromStorage());
+  const [savedSignatures, setSavedSignatures] = useState<SavedSignature[]>([]);
+  const [storageType, setStorageType] = useState<StorageType | null>(null);
+  const [isLoading, setIsLoading] = useState(true);

+  // Load signatures and detect storage type on mount
  useEffect(() => {
-    if (!isSupportedEnvironment()) {
+    const loadSignatures = async () => {
+      try {
+        const [signatures, type] = await Promise.all([
+          signatureStorageService.loadSignatures(),
+          signatureStorageService.getStorageType(),
+        ]);
+        setSavedSignatures(signatures);
+        setStorageType(type);
+      } catch (error) {
+        console.error('[useSavedSignatures] Failed to load signatures:', error);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+
+    loadSignatures();
+  }, []);
+
+  // Attempt migration from localStorage to backend when backend becomes available
+  useEffect(() => {
+    if (storageType === 'backend' && !isLoading) {
+      signatureStorageService.migrateToBackend().then(result => {
+        if (result.migrated > 0) {
+          console.log(`[useSavedSignatures] Migrated ${result.migrated} signatures to backend`);
+          // Reload after migration
+          signatureStorageService.loadSignatures().then(setSavedSignatures);
+        }
+      });
+    }
+  }, [storageType, isLoading]);
+
+  // Listen for storage events (for localStorage only)
+  useEffect(() => {
+    if (!isSupportedEnvironment() || storageType !== 'localStorage') {
      return;
    }

    const syncFromStorage = () => {
-      setSavedSignatures(readFromStorage());
+      signatureStorageService.loadSignatures().then(setSavedSignatures);
    };

    window.addEventListener('storage', syncFromStorage);
    return () => window.removeEventListener('storage', syncFromStorage);
-  }, []);
-
-  useEffect(() => {
-    writeToStorage(savedSignatures);
-  }, [savedSignatures]);
+  }, [storageType]);

  const isAtCapacity = savedSignatures.length >= MAX_SAVED_SIGNATURES;

  const addSignature = useCallback(
-    (payload: SavedSignaturePayload, label?: string): AddSignatureResult => {
+    async (payload: SavedSignaturePayload, label?: string, scope?: SignatureScope): Promise<AddSignatureResult> => {
      if (
        (payload.type === 'text' && !payload.signerName.trim()) ||
        ((payload.type === 'canvas' || payload.type === 'image') && !payload.dataUrl)
@@ -135,62 +108,85 @@ export const useSavedSignatures = () => {
        return { success: false, reason: 'invalid' };
      }

-      let createdSignature: SavedSignature | null = null;
-      setSavedSignatures(prev => {
-        if (prev.length >= MAX_SAVED_SIGNATURES) {
-          return prev;
-        }
+      if (savedSignatures.length >= MAX_SAVED_SIGNATURES) {
+        return { success: false, reason: 'limit' };
+      }

-        const timestamp = Date.now();
-        const nextEntry: SavedSignature = {
-          ...payload,
-          id: generateId(),
-          label: (label || 'Signature').trim() || 'Signature',
-          createdAt: timestamp,
-          updatedAt: timestamp,
-        };
-        createdSignature = nextEntry;
-        return [nextEntry, ...prev];
-      });
+      const timestamp = Date.now();
+      const newSignature: SavedSignature = {
+        ...payload,
+        id: generateId(),
+        label: (label || 'Signature').trim() || 'Signature',
+        scope: scope || (storageType === 'backend' ? 'personal' : 'localStorage'),
+        createdAt: timestamp,
+        updatedAt: timestamp,
+      };

-      return createdSignature
-        ? { success: true, signature: createdSignature }
-        : { success: false, reason: 'limit' };
+      try {
+        await signatureStorageService.saveSignature(newSignature);
+        setSavedSignatures(prev => [newSignature, ...prev]);
+        return { success: true, signature: newSignature };
+      } catch (error) {
+        console.error('[useSavedSignatures] Failed to save signature:', error);
+        return { success: false, reason: 'invalid' };
+      }
    },
-    []
+    [savedSignatures.length, storageType]
  );

-  const removeSignature = useCallback((id: string) => {
-    setSavedSignatures(prev => prev.filter(entry => entry.id !== id));
+  const removeSignature = useCallback(async (id: string) => {
+    try {
+      await signatureStorageService.deleteSignature(id);
+      setSavedSignatures(prev => prev.filter(entry => entry.id !== id));
+    } catch (error) {
+      console.error('[useSavedSignatures] Failed to delete signature:', error);
+    }
  }, []);

-  const updateSignatureLabel = useCallback((id: string, nextLabel: string) => {
-    setSavedSignatures(prev =>
-      prev.map(entry =>
-        entry.id === id
-          ? { ...entry, label: nextLabel.trim() || entry.label || 'Signature', updatedAt: Date.now() }
-          : entry
-      )
-    );
+  const updateSignatureLabel = useCallback(async (id: string, nextLabel: string) => {
+    try {
+      await signatureStorageService.updateSignatureLabel(id, nextLabel);
+      setSavedSignatures(prev =>
+        prev.map(entry =>
+          entry.id === id
+            ? { ...entry, label: nextLabel.trim() || entry.label || 'Signature', updatedAt: Date.now() }
+            : entry
+        )
+      );
+    } catch (error) {
+      console.error('[useSavedSignatures] Failed to update signature label:', error);
+    }
  }, []);

-  const replaceSignature = useCallback((id: string, payload: SavedSignaturePayload) => {
-    setSavedSignatures(prev =>
-      prev.map(entry =>
-        entry.id === id
-          ? {
-              ...entry,
-              ...payload,
-              updatedAt: Date.now(),
-            }
-          : entry
-      )
-    );
-  }, []);
+  const replaceSignature = useCallback(
+    async (id: string, payload: SavedSignaturePayload) => {
+      const existing = savedSignatures.find(s => s.id === id);
+      if (!existing) return;

-  const clearSignatures = useCallback(() => {
-    setSavedSignatures([]);
-  }, []);
+      const updated: SavedSignature = {
+        ...existing,
+        ...payload,
+        updatedAt: Date.now(),
+      };
+
+      try {
+        await signatureStorageService.saveSignature(updated);
+        setSavedSignatures(prev => prev.map(entry => (entry.id === id ? updated : entry)));
+      } catch (error) {
+        console.error('[useSavedSignatures] Failed to replace signature:', error);
+      }
+    },
+    [savedSignatures]
+  );
+
+  const clearSignatures = useCallback(async () => {
+    try {
+      await Promise.all(savedSignatures.map(sig => signatureStorageService.deleteSignature(sig.id)));
+      setSavedSignatures([]);
+    } catch (error) {
+      console.error('[useSavedSignatures] Failed to clear signatures:', error);
+    }
+  }, [savedSignatures]);

  const byTypeCounts = useMemo(() => {
    return savedSignatures.reduce<Record<SavedSignatureType, number>>(
@@ -211,6 +207,8 @@ export const useSavedSignatures = () => {
    replaceSignature,
    clearSignatures,
    byTypeCounts,
+    storageType,
+    isLoading,
  };
 };

@@ -4,7 +4,7 @@ import auditService, { AuditFilters } from '@app/services/auditService';
 /**
 * Shared hook for managing audit filters across components
 */
-export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}) {
+export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}, loginEnabled: boolean = true) {
  const [eventTypes, setEventTypes] = useState<string[]>([]);
  const [users, setUsers] = useState<string[]>([]);
  const [filters, setFilters] = useState<AuditFilters>({
@@ -30,8 +30,10 @@ export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}) {
      }
    };

-    fetchMetadata();
-  }, []);
+    if (loginEnabled) {
+      fetchMetadata();
+    }
+  }, [loginEnabled]);

  const handleFilterChange = (key: keyof AuditFilters, value: any) => {
    setFilters((prev) => ({ ...prev, [key]: value }));
@@ -19,10 +19,12 @@ declare global {

 interface CookieConsentConfig {
  analyticsEnabled?: boolean;
+  forceLightMode?: boolean;
 }

 export const useCookieConsent = ({
-  analyticsEnabled = false
+  analyticsEnabled = false,
+  forceLightMode = false
 }: CookieConsentConfig = {}) => {
  const { t } = useTranslation();
  const { config } = useAppConfig();
@@ -69,6 +71,12 @@ export const useCookieConsent = ({

        // Detect current theme and set appropriate mode
        const detectTheme = () => {
+          // If forceLightMode is enabled, always use light mode
+          if (forceLightMode) {
+            document.documentElement.classList.remove('cc--darkmode');
+            return false;
+          }
+
          const mantineScheme = document.documentElement.getAttribute('data-mantine-color-scheme');
          const hasLightClass = document.documentElement.classList.contains('light');
          const hasDarkClass = document.documentElement.classList.contains('dark');
@@ -104,21 +112,24 @@ export const useCookieConsent = ({
          return;
        }

-        // Listen for theme changes
-        const themeObserver = new MutationObserver((mutations) => {
-          mutations.forEach((mutation) => {
-            if (mutation.type === 'attributes' &&
-                (mutation.attributeName === 'data-mantine-color-scheme' ||
-                 mutation.attributeName === 'class')) {
-              detectTheme();
-            }
+        // Listen for theme changes (but not if forceLightMode is enabled)
+        let themeObserver: MutationObserver | null = null;
+        if (!forceLightMode) {
+          themeObserver = new MutationObserver((mutations) => {
+            mutations.forEach((mutation) => {
+              if (mutation.type === 'attributes' &&
+                  (mutation.attributeName === 'data-mantine-color-scheme' ||
+                   mutation.attributeName === 'class')) {
+                detectTheme();
+              }
+            });
          });
-        });

-        themeObserver.observe(document.documentElement, {
-          attributes: true,
-          attributeFilter: ['data-mantine-color-scheme', 'class']
-        });
+          themeObserver.observe(document.documentElement, {
+            attributes: true,
+            attributeFilter: ['data-mantine-color-scheme', 'class']
+          });
+        }


        // Initialize cookie consent with full configuration
@@ -245,6 +256,65 @@ export const useCookieConsent = ({
    };
  }, [analyticsEnabled, config?.enablePosthog, config?.enableScarf, t]);

+  // Update theme when forceLightMode changes
+  useEffect(() => {
+    if (!isInitialized) return;
+
+    const detectTheme = () => {
+      if (forceLightMode) {
+        document.documentElement.classList.remove('cc--darkmode');
+        return false;
+      }
+
+      const mantineScheme = document.documentElement.getAttribute('data-mantine-color-scheme');
+      const hasLightClass = document.documentElement.classList.contains('light');
+      const hasDarkClass = document.documentElement.classList.contains('dark');
+      const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+
+      let isDarkMode = false;
+      if (mantineScheme) {
+        isDarkMode = mantineScheme === 'dark';
+      } else if (hasLightClass) {
+        isDarkMode = false;
+      } else if (hasDarkClass) {
+        isDarkMode = true;
+      } else {
+        isDarkMode = systemPrefersDark;
+      }
+
+      document.documentElement.classList.toggle('cc--darkmode', isDarkMode);
+      return isDarkMode;
+    };
+
+    // Update theme immediately
+    detectTheme();
+
+    // Set up or remove theme observer based on forceLightMode
+    let themeObserver: MutationObserver | null = null;
+    if (!forceLightMode) {
+      themeObserver = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+          if (mutation.type === 'attributes' &&
+              (mutation.attributeName === 'data-mantine-color-scheme' ||
+               mutation.attributeName === 'class')) {
+            detectTheme();
+          }
+        });
+      });
+
+      themeObserver.observe(document.documentElement, {
+        attributes: true,
+        attributeFilter: ['data-mantine-color-scheme', 'class']
+      });
+    }
+
+    return () => {
+      if (themeObserver) {
+        themeObserver.disconnect();
+      }
+    };
+  }, [forceLightMode, isInitialized]);
+
  // Hide cookie banner when tour is active
  useEffect(() => {
    if (!isInitialized || !window.CookieConsent) {
@@ -0,0 +1,49 @@
+import { useState, useEffect } from 'react';
+import apiClient from '@app/services/apiClient';
+
+export interface FooterInfo {
+  analyticsEnabled?: boolean;
+  termsAndConditions?: string;
+  privacyPolicy?: string;
+  accessibilityStatement?: string;
+  cookiePolicy?: string;
+  impressum?: string;
+}
+
+/**
+ * Hook to fetch public footer configuration data.
+ * This endpoint is always accessible without authentication.
+ */
+export function useFooterInfo() {
+  const [footerInfo, setFooterInfo] = useState<FooterInfo | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    const fetchFooterInfo = async () => {
+      try {
+        setLoading(true);
+        console.log('[useFooterInfo] Fetching footer info from /api/v1/ui-data/footer-info...');
+        const response = await apiClient.get<FooterInfo>('/api/v1/ui-data/footer-info', {
+          suppressErrorToast: true,
+        } as any);
+        console.log('[useFooterInfo] Footer info received:', response.data);
+        setFooterInfo(response.data);
+        setError(null);
+      } catch (err) {
+        console.error('[useFooterInfo] Failed to fetch footer info:', err);
+        setError(err as Error);
+        // Set defaults on error
+        setFooterInfo({
+          analyticsEnabled: false,
+        });
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchFooterInfo();
+  }, []);
+
+  return { footerInfo, loading, error };
+}
@@ -0,0 +1,282 @@
+import apiClient from '@app/services/apiClient';
+import type { SavedSignature } from '@app/hooks/tools/sign/useSavedSignatures';
+
+export type StorageType = 'backend' | 'localStorage';
+
+interface SignatureStorageCapabilities {
+  supportsBackend: boolean;
+  storageType: StorageType;
+}
+
+/**
+ * Service to handle signature storage with adaptive backend/localStorage fallback
+ */
+class SignatureStorageService {
+  private capabilities: SignatureStorageCapabilities | null = null;
+  private detectionPromise: Promise<SignatureStorageCapabilities> | null = null;
+  private blobUrls: Set<string> = new Set();
+
+  /**
+   * Detect if backend supports signature storage API
+   */
+  async detectCapabilities(): Promise<SignatureStorageCapabilities> {
+    // Return cached result if already detected
+    if (this.capabilities) {
+      return this.capabilities;
+    }
+
+    // Return in-flight detection if already running
+    if (this.detectionPromise) {
+      return this.detectionPromise;
+    }
+
+    // Start new detection
+    this.detectionPromise = this._performDetection();
+    this.capabilities = await this.detectionPromise;
+    this.detectionPromise = null;
+
+    return this.capabilities;
+  }
+
+  private async _performDetection(): Promise<SignatureStorageCapabilities> {
+    try {
+      // Probe the proprietary signatures endpoint (requires authentication)
+      await apiClient.get('/api/v1/proprietary/signatures', {
+        timeout: 3000,
+      });
+
+      // 200 = Backend available and accessible (authenticated)
+      console.log('[SignatureStorage] Backend signature API detected and accessible (authenticated)');
+      return {
+        supportsBackend: true,
+        storageType: 'backend',
+      };
+    } catch (error: any) {
+      // Check if it's an HTTP error with status code
+      if (error?.response?.status === 401 || error?.response?.status === 403) {
+        // Backend exists but needs auth - gracefully fall back to localStorage
+        console.log('[SignatureStorage] Backend signature API requires authentication, using localStorage');
+      } else if (error?.response?.status === 404) {
+        // Endpoint doesn't exist (not running proprietary mode)
+        console.log('[SignatureStorage] Backend signature API not available (not in proprietary mode), using localStorage');
+      } else {
+        // Network error, timeout, or other error
+        console.log('[SignatureStorage] Backend signature API not available, using localStorage');
+      }
+
+      return {
+        supportsBackend: false,
+        storageType: 'localStorage',
+      };
+    }
+  }
+
+  /**
+   * Get current storage type
+   */
+  async getStorageType(): Promise<StorageType> {
+    const capabilities = await this.detectCapabilities();
+    return capabilities.storageType;
+  }
+
+  /**
+   * Load all signatures
+   */
+  async loadSignatures(): Promise<SavedSignature[]> {
+    // Clean up old blob URLs before loading new ones
+    this.cleanup();
+
+    const capabilities = await this.detectCapabilities();
+
+    if (capabilities.supportsBackend) {
+      return this._loadFromBackend();
+    } else {
+      return this._loadFromLocalStorage();
+    }
+  }
+
+  /**
+   * Save a signature
+   */
+  async saveSignature(signature: SavedSignature): Promise<void> {
+    const capabilities = await this.detectCapabilities();
+
+    if (capabilities.supportsBackend && signature.scope !== 'localStorage') {
+      await this._saveToBackend(signature);
+    } else {
+      // Force scope to localStorage for browser storage
+      signature.scope = 'localStorage';
+      this._saveToLocalStorage(signature);
+    }
+  }
+
+  /**
+   * Delete a signature
+   */
+  async deleteSignature(id: string): Promise<void> {
+    const capabilities = await this.detectCapabilities();
+
+    if (capabilities.supportsBackend) {
+      await this._deleteFromBackend(id);
+    } else {
+      this._deleteFromLocalStorage(id);
+    }
+  }
+
+  /**
+   * Update signature label
+   */
+  async updateSignatureLabel(id: string, label: string): Promise<void> {
+    const capabilities = await this.detectCapabilities();
+
+    if (capabilities.supportsBackend) {
+      // Backend only stores images - labels not supported for backend signatures
+      console.log('[SignatureStorage] Label updates not supported for backend signatures');
+      return;
+    } else {
+      this._updateLabelInLocalStorage(id, label);
+    }
+  }
+
+  // Backend methods
+  private async _loadFromBackend(): Promise<SavedSignature[]> {
+    try {
+      const response = await apiClient.get<SavedSignature[]>('/api/v1/proprietary/signatures');
+      const signatures = response.data;
+
+      // Fetch image data for each signature and convert to blob URLs
+      const signaturePromises = signatures.map(async (sig) => {
+        if (sig.dataUrl && sig.dataUrl.startsWith('/api/v1/general/signatures/')) {
+          try {
+            // Fetch image via apiClient (unified endpoint works for both authenticated and unauthenticated)
+            const imageResponse = await apiClient.get<ArrayBuffer>(sig.dataUrl, {
+              responseType: 'arraybuffer',
+            });
+
+            // Convert to blob URL
+            const blob = new Blob([imageResponse.data], {
+              type: imageResponse.headers['content-type'] || 'image/png',
+            });
+            const blobUrl = URL.createObjectURL(blob);
+            this.blobUrls.add(blobUrl);
+
+            return { ...sig, dataUrl: blobUrl };
+          } catch (error) {
+            console.error(`[SignatureStorage] Failed to load image for ${sig.id}:`, error);
+            return sig; // Return original if image fetch fails
+          }
+        }
+        return sig;
+      });
+
+      return await Promise.all(signaturePromises);
+    } catch (error) {
+      console.error('[SignatureStorage] Failed to load from backend:', error);
+      return [];
+    }
+  }
+
+  private async _saveToBackend(signature: SavedSignature): Promise<void> {
+    await apiClient.post('/api/v1/proprietary/signatures', signature);
+  }
+
+  private async _deleteFromBackend(id: string): Promise<void> {
+    await apiClient.delete(`/api/v1/proprietary/signatures/${id}`);
+  }
+
+  // LocalStorage methods
+  private readonly STORAGE_KEY = 'stirling:saved-signatures:v1';
+
+  private _loadFromLocalStorage(): SavedSignature[] {
+    try {
+      const raw = localStorage.getItem(this.STORAGE_KEY);
+      if (!raw) return [];
+      const signatures = JSON.parse(raw);
+      // Ensure all localStorage signatures have the correct scope
+      return signatures.map((sig: SavedSignature) => ({
+        ...sig,
+        scope: 'localStorage' as const,
+      }));
+    } catch {
+      return [];
+    }
+  }
+
+  private _saveToLocalStorage(signature: SavedSignature): void {
+    const signatures = this._loadFromLocalStorage();
+    const index = signatures.findIndex(s => s.id === signature.id);
+
+    if (index >= 0) {
+      signatures[index] = signature;
+    } else {
+      signatures.unshift(signature);
+    }
+
+    localStorage.setItem(this.STORAGE_KEY, JSON.stringify(signatures));
+  }
+
+  private _deleteFromLocalStorage(id: string): void {
+    const signatures = this._loadFromLocalStorage();
+    const filtered = signatures.filter(s => s.id !== id);
+    localStorage.setItem(this.STORAGE_KEY, JSON.stringify(filtered));
+  }
+
+  private _updateLabelInLocalStorage(id: string, label: string): void {
+    const signatures = this._loadFromLocalStorage();
+    const signature = signatures.find(s => s.id === id);
+    if (signature) {
+      signature.label = label;
+      signature.updatedAt = Date.now();
+      localStorage.setItem(this.STORAGE_KEY, JSON.stringify(signatures));
+    }
+  }
+
+  /**
+   * Migrate signatures from localStorage to backend
+   */
+  async migrateToBackend(): Promise<{ migrated: number; failed: number }> {
+    const capabilities = await this.detectCapabilities();
+
+    if (!capabilities.supportsBackend) {
+      return { migrated: 0, failed: 0 };
+    }
+
+    const localSignatures = this._loadFromLocalStorage();
+    if (localSignatures.length === 0) {
+      return { migrated: 0, failed: 0 };
+    }
+
+    let migrated = 0;
+    let failed = 0;
+
+    for (const signature of localSignatures) {
+      try {
+        await this._saveToBackend(signature);
+        migrated++;
+      } catch (error) {
+        console.error(`[SignatureStorage] Failed to migrate signature ${signature.id}:`, error);
+        failed++;
+      }
+    }
+
+    // Clear localStorage after successful migration
+    if (migrated > 0 && failed === 0) {
+      localStorage.removeItem(this.STORAGE_KEY);
+      console.log(`[SignatureStorage] Successfully migrated ${migrated} signatures to backend`);
+    }
+
+    return { migrated, failed };
+  }
+
+  /**
+   * Clean up blob URLs to prevent memory leaks
+   */
+  cleanup(): void {
+    this.blobUrls.forEach(url => {
+      URL.revokeObjectURL(url);
+    });
+    this.blobUrls.clear();
+  }
+}
+
+export const signatureStorageService = new SignatureStorageService();
@@ -31,10 +31,10 @@ export function AppProviders({ children }: { children: ReactNode }) {
    }
  }, [setupComplete, isFirstLaunch, connectionMode]);

-  // Only start bundled backend if in SaaS mode (local backend) and setup is complete
-  // Self-hosted mode connects to remote server so doesn't need local backend
-  const shouldStartBackend = setupComplete && !isFirstLaunch && connectionMode === 'saas';
-  useBackendInitializer(shouldStartBackend);
+  // Initialize monitoring for bundled backend (already started in Rust)
+  // This sets up port detection and health checks
+  const shouldMonitorBackend = setupComplete && !isFirstLaunch && connectionMode === 'saas';
+  useBackendInitializer(shouldMonitorBackend);

  // Show setup wizard on first launch
  if (isFirstLaunch && !setupComplete) {
@@ -51,23 +51,7 @@ export function AppProviders({ children }: { children: ReactNode }) {
        }}
      >
        <SetupWizard
-          onComplete={async () => {
-            // Wait for backend to become healthy before reloading
-            // This prevents reloading mid-startup which would interrupt the backend
-            const maxWaitTime = 60000; // 60 seconds max
-            const checkInterval = 1000; // Check every second
-            const startTime = Date.now();
-
-            while (Date.now() - startTime < maxWaitTime) {
-              if (tauriBackendService.isBackendHealthy()) {
-                window.location.reload();
-                return;
-              }
-              await new Promise(resolve => setTimeout(resolve, checkInterval));
-            }
-
-            // If we timeout, reload anyway
-            console.warn('[AppProviders] Backend health check timeout, reloading anyway...');
+          onComplete={() => {
            window.location.reload();
          }}
        />
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Stack, TextInput, PasswordInput, Button, Text, Divider, Group } from '@mantine/core';
+import { Stack, TextInput, PasswordInput, Button, Text, Divider, Group, Collapse, Anchor, Box } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { authService } from '@app/services/authService';
 import { STIRLING_SAAS_URL } from '@app/constants/connection';
@@ -19,6 +19,7 @@ export const LoginForm: React.FC<LoginFormProps> = ({ serverUrl, isSaaS = false,
  const [password, setPassword] = useState('');
  const [validationError, setValidationError] = useState<string | null>(null);
  const [oauthLoading, setOauthLoading] = useState(false);
+  const [showInstructions, setShowInstructions] = useState(false);

  const handleSubmit = async (e: React.FormEvent) => {
    e.preventDefault();
@@ -92,6 +93,47 @@ export const LoginForm: React.FC<LoginFormProps> = ({ serverUrl, isSaaS = false,
          {t('setup.login.connectingTo', 'Connecting to:')} <strong>{isSaaS ? 'stirling.com' : serverUrl}</strong>
        </Text>

+        {/* Login requirement note for self-hosted servers */}
+        {!isSaaS && (
+          <Box>
+            <Text size="xs" c="dimmed">
+              {t('setup.login.serverRequirement', 'Note: The server must have login enabled.')}{' '}
+              <Anchor
+                size="xs"
+                onClick={() => setShowInstructions(!showInstructions)}
+                style={{ cursor: 'pointer' }}
+              >
+                {showInstructions
+                  ? t('setup.login.hideInstructions', 'Hide instructions')
+                  : t('setup.login.showInstructions', 'How to enable?')}
+              </Anchor>
+            </Text>
+
+            <Collapse in={showInstructions}>
+              <Box mt="xs" p="sm" style={{ backgroundColor: 'var(--mantine-color-gray-0)', borderRadius: '4px' }}>
+                <Text size="xs" c="dimmed">
+                  {t('setup.login.instructions', 'To enable login on your Stirling PDF server:')}
+                </Text>
+                <Text size="xs" mt="xs" c="dimmed">
+                  {t('setup.login.instructionsEnvVar', 'Set the environment variable:')}
+                </Text>
+                <Text size="xs" mt="4px" ff="monospace" c="dark">
+                  SECURITY_ENABLELOGIN=true
+                </Text>
+                <Text size="xs" mt="xs" c="dimmed">
+                  {t('setup.login.instructionsOrYml', 'Or in settings.yml:')}
+                </Text>
+                <Text size="xs" mt="4px" ff="monospace" c="dark">
+                  security.enableLogin: true
+                </Text>
+                <Text size="xs" mt="xs" c="dimmed">
+                  {t('setup.login.instructionsRestart', 'Then restart your server for the changes to take effect.')}
+                </Text>
+              </Box>
+            </Collapse>
+          </Box>
+        )}
+
        {/* OAuth Login Buttons - Only show for SaaS */}
        {isSaaS && (
          <>
@@ -63,7 +63,7 @@ export const ModeSelection: React.FC<ModeSelectionProps> = ({ onSelect, loading
        <div style={{ textAlign: 'left', flex: 1 }}>
          <Text fw={600} size="md">{t('setup.mode.selfhosted.title', 'Self-Hosted Server')}</Text>
          <Text size="sm" c="dimmed" fw={400}>
-            {t('setup.mode.selfhosted.description', 'Connect to your own Stirling PDF server')}
+            {t('setup.mode.selfhosted.description', 'Connect to your own Stirling PDF server with your personal account')}
          </Text>
        </div>
      </Button>
@@ -61,7 +61,7 @@ export const SetupWizard: React.FC<SetupWizardProps> = ({ onComplete }) => {
      }

      await connectionModeService.switchToSaaS(serverConfig.url);
-      await tauriBackendService.startBackend();
+      tauriBackendService.startBackend().catch(console.error);
      onComplete();
    } catch (err) {
      console.error('SaaS login failed:', err);
--- a/Show More
+++ b/Show More